Everything you need for Git
native and free.
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.
Core Git
Smart resolution
8 deterministic patterns with a pattern registry and confidence scoring. 95%+ of trivial conflicts resolved without intervention.
Integrated Pull Requests
Review GitHub, GitLab, Bitbucket and Azure DevOps PRs directly in the app — comments, reviews, CI status, conflict preview.
Visual diff
Unified diff viewer with syntax highlighting, hunk-level staging, and merge preview.
Folder tree diff
Flat ↔ tree toggle in the file list with per-folder aggregates, click-to-filter and a resizable sidebar.
Split a commit by hunks
Break a commit in two by picking files and lines — handles added, deleted and renamed files.
Tags manager
List, create, push and delete local and remote tags. AI-suggested next semantic version.
Power user
Git worktrees
Work on multiple branches at once without stashing. Each worktree opens as a tab, created in one click.
Submodule management
List, initialize and update submodules with status badges, open them as tabs.
Advanced file history
Pickaxe search (-S/-G), blame by line range, and a diff algorithm selector.
History & graph
Full history, interactive DAG graph, file blame and natural-language commit search.
Commit context menu
12 right-click actions: checkout, reset, revert, new branch, tag, cherry-pick, view on forge, copy SHA.
Fork & triangular workflow
“↑N fork” badge in the sync button so push remote ≠ upstream — no accidental pushes to origin.
Integrated terminal & AI agents
A real PTY terminal in-app — WebGL rendering, inline search, clickable links, typed tabs. Beyond a plain shell, first-class agent tabs launch Claude Code, Codex, opencode or Antigravity, and “New AI task” runs an agent in an isolated scratch worktree.
File explorer & editor
A gitignore-aware working-tree file tree with a built-in CodeMirror 6 editor: syntax highlighting, a lock/edit toggle, undo and save — read and tweak files without leaving GitWand.
AI (opt-in)
AI merge insight
Plain-English conflict explanation, AI risk summary before rebase/merge, semantic squash in interactive rebase.
AI code review & PR
Auto-generated PR title and description, per-hunk AI critique in the Review panel, branch-name suggestions.
AI commit & history
Generated commit and stash messages, semantically-ranked Absorb, blame context and release notes.
MCP server
Expose GitWand to Claude Code, Cursor, Windsurf and any MCP client. One command: npx -y @gitwand/mcp.
New in v3.4
Token-level merge
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.
2-way base recovery
Reconstructs the diff3 base from the git index so the base-dependent patterns work even on repos using git’s default conflict style — where they used to sit inert.
Resolution preview + per-hunk confirm
Every auto-resolvable hunk shows its result before you apply it, and “Resolve auto” confirms a per-hunk summary instead of applying blind.
Recoverable-before-model metric
See how much of the residual is still resolved deterministically before any AI — in the CLI, the merge editor, and a cumulative local tally in Settings.
How GitWand compares
Feature-by-feature against the most popular Git clients. Fact-checked July 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 | ✓ | ✓ | ✓ | ✗ | ✓ | ✗ | ✓ |
| Virtual / stacked branches | ✗ | ✗ | ✗ | ✗ | ✗ | ✓ | ✗ |
| Multi-repo workspaces | ✓ | ✓ | ✓ | ✗ | ✗ | ✗ | ~ |
| Cross-repo dashboard | ✓ | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ |
| Code review & forges | |||||||
| In-app PR/MR review | ✓ | ✓ | ~ | ✗ | ~ | ~ | ✗ |
| GitHub · GitLab · Bitbucket · Azure | ✓ | ✓ | ✓ | ✗ | ✗ | ✗ | ✓ |
| 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.