A complete daily workflow with no performance compromise, across three consistent interfaces: desktop app, CLI and VS Code. Below: the full feature set, and an honest feature-by-feature comparison with the popular clients.
Describe your environment once in .gitwandrc (ignored files to copy, setup, teardown, URL). Each new worktree starts from a freshly fetched base and comes up ready to run; GitWand asks before running the repo’s commands.
Bring a task’s work into your branch as a merge, a rebase or a squash, through the same preview as any other merge. Both checkouts are snapshotted first, nothing is stashed or aborted behind your back.
Removing a worktree stops its processes, snapshots its files and runs teardown, which has to succeed. Locked worktrees and other tools’ worktrees are never touched.
The Time Machine lists removed worktrees and restores one as a new worktree, uncommitted files, index and setup included.
8 deterministic patterns with a pattern registry and confidence scoring. Conflicts that carry no decision are resolved without intervention, each with a trace.
The Conflict Predictor runs the real merge, applies what clears your confidence bar and stops on what needs you. It never aborts on your behalf.
minConfidenceScore (0–100) in the app, .gitwandrc, the CLI and MCP. Per-hunk checkboxes let you decline one resolution without declining the rest.
Both sides changed disjoint tokens on the same line — GitWand decomposes it token by token and proposes the merge. Never auto-applied: you confirm it in a panel.
Reconstructs the diff3 base from the git index so the base-dependent patterns work even on repos using git’s default conflict style.
Opt-in: when a hunk goes to a model, the prompt says why each side changed it, from the commits since the merge base. A repository can turn it off for everyone.
Your history as a graph, with uncommitted work as a WIP row at the top. Follows every ref move as it happens, even from a terminal.
Review GitHub, GitLab, Bitbucket, Azure DevOps, Gitea and Forgejo PRs in the app — comments, reviews, CI status, conflict preview, and auto-merge once checks pass.
Unified diff viewer with syntax highlighting, hunk-level staging, merge preview, and hunks you can edit in place.
Reset --keep refuses instead of discarding an edit, opt-in auto fast-forward after fetch, Cherry-pick as WIP, and a Time Machine snapshot before every rewrite.
Break a commit in two by picking files and lines — handles added, deleted and renamed files.
List, create, push and delete local and remote tags. AI-suggested next semantic version.
Work on several branches at once without stashing. Each worktree opens as a tab, created in one click, set up by your repo’s own commands.
List, initialize and update submodules with status badges, open them as tabs.
Pickaxe search (-S/-G), blame by line range, a diff algorithm selector, and a Compare tab that follows renames.
Right-click actions: checkout, reset, revert, new branch, tag, cherry-pick (or as WIP), view on forge, copy SHA.
“↑N fork” badge in the sync button so push remote ≠ upstream — no accidental pushes to origin.
GitWand’s own terminal emulator, fast even without a GPU: truecolor, search, clickable links, Nerd Font icons. Typed tabs launch Claude Code, Codex, opencode or Antigravity, and “New AI task” runs an agent in its own worktree.
A file browser for the whole working tree, with a badge on every changed file and the folders above it, a diff or editor per tab, blame, and “Scope here”.
Plain-English conflict explanation, AI risk summary before rebase/merge, semantic squash in interactive rebase.
Generated or redrafted PR titles and descriptions, per-hunk AI critique in the Review panel, branch-name suggestions, and a “ctx” field for what the diff can’t say.
Generated commit and stash messages, semantically-ranked Absorb, blame context and release notes, with per-repo templates and output language.
AI CLIs run in an empty environment and a throwaway folder, without your forge tokens; API keys live in the system keychain.
Expose GitWand to Claude Code, Cursor, Windsurf and any MCP client. One command: npx -y @gitwand/mcp.
Feature-by-feature against the most popular Git clients. Fact-checked July 2026; worktree, forge and agent rows re-checked November 2026.
| GitWandFree · MIT | GitKrakenFree / $8/mo Pro | Fork$59.99 · Native | Sublime Merge$99 · Native | GitHub DesktopFree · Electron | GitButlerFree · Tauri/Rust | Tower$69/yr · Native | |
|---|---|---|---|---|---|---|---|
| Workflow | |||||||
| Free & open source | ✓ | ✗ | ✗ | ✗ | ✓ | ✓ | ✗ |
| Native app (no Electron) | ✓ | ✗ | ✓ | ✓ | ✗ | ✓ | ✓ |
| Linux support | ✓ | ✓ | ✗ | ✓ | ✗ | ✓ | ✗ |
| CLI tool | ✓ | ✓ | ✗ | ✗ | ✗ | ✓ | ✗ |
| VS Code extension | ✓ | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ |
| Conflict resolution | |||||||
| Deterministic auto-resolveGitWand | ✓ | ~ | ✗ | ✗ | ~ | ✗ | ✗ |
| Confidence score per hunkGitWand | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ | ✗ |
| Decision trace per hunkGitWand | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ | ✗ |
| Zero-impact merge/rebase previewGitWand | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ | ✗ |
| Predict rebase & cherry-pickGitWand | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ | ✗ |
| Scratch-worktree resolutionGitWand | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ | ✗ |
| Power Git | |||||||
| Interactive rebase | ✓ | ✓ | ✓ | ✓ | ✗ | ✓ | ✓ |
| Split commit by hunks | ✓ | ✗ | ✗ | ✓ | ✗ | ✗ | ✗ |
| Worktrees | ✓ | ✓ | ✓ | ~ | ✓ | ✗ | ✓ |
| Worktree setup / teardown hooksGitWand | ✓ | ~ | ✗ | ✗ | ✗ | ✗ | ✗ |
| Merge agent work back (merge / rebase / squash)GitWand | ✓ | ✗ | ✗ | ✗ | ✗ | ~ | ✗ |
| Virtual / stacked branches | ✗ | ✗ | ✗ | ✗ | ✗ | ✓ | ✗ |
| Multi-repo workspaces | ✓ | ✓ | ✓ | ✗ | ✗ | ✗ | ~ |
| Cross-repo dashboard | ✓ | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ |
| Code review & forges | |||||||
| In-app PR/MR review | ✓ | ✓ | ~ | ✗ | ~ | ~ | ✗ |
| GitHub · GitLab · Bitbucket · Azure | ✓ | ✓ | ✓ | ✗ | ✗ | ✗ | ✓ |
| Gitea / Forgejo | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ | ~ |
| Inline CI check annotations | ✓ | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ |
| AI & agentsGitWand uses the coding-agent CLIs you already have (Claude Code, Codex, opencode…). No built-in model, no account. | |||||||
| Launch coding agents in-app | ✓ | ✓ | ✗ | ✗ | ✗ | ✓ | ✗ |
| MCP server for AI agents | ✓ | ✓ | ✗ | ✗ | ✗ | ✓ | ✗ |
| AI conflict explanation | ✓ | ~ | ✗ | ✗ | ~ | ✗ | ✗ |
| AI commit messages | ✓ | ✓ | ✓ | ✗ | ✓ | ~ | ✓ |
✓ yes ~ partial ✗ no · Fact-checked July 2026 — spot something off? open an issue.