GitWand
GitWand is a native Git client with desktop, CLI, and VS Code interfaces for working with local repositories, regardless of hosting service.
What GitWand is
GitWand is a native Git client with desktop, CLI, and VS Code interfaces for working with local repositories, regardless of hosting service. Its Git workflow includes visual diffs, hunk-level staging, commit splitting, worktrees, submodule management, and an interactive history graph. It also supports pull request reviews for GitHub, GitLab, Bitbucket, and Azure DevOps, with comments, reviews, CI status, and conflict previews.
For conflicts the engine classifies as safe, GitWand uses deterministic patterns with confidence scores and decision traces. It proposes token-level merges for confirmation and surfaces complex conflicts for review. AI conflict resolution is optional; users can configure a provider such as Claude, an OpenAI-compatible endpoint, Ollama, or MCP using their own key or endpoint. GitWand offers an MCP server for AI clients including Claude Code, Cursor, and Windsurf. The product says it runs locally without an account or telemetry, and its MCP server requires no API key or network access. If users choose a hosted LLM, unresolved hunks and surrounding context are sent to that provider. The free plan is free, MIT-licensed, with no seat licence or account.
Good
- Works with any local Git repository.
- Supports pull request review across four platforms.
- Includes submodule management and interactive rebase.
- Free plan is MIT-licensed with no seat licence.
- Offline mode is supported.
Watch out
- Hosted LLM use sends unresolved hunks and context to that provider.
- AI conflict resolution is opt-in.
Who it suits
GitWand suits developers who want desktop, command-line, and VS Code access to local Git repositories, along with conflict review and pull request tools. Its optional AI features may suit people already using supported AI clients or providers.
Verdict
GitWand combines everyday Git workflow tools with pull request review and a conflict-resolution process that keeps complex cases available for review. It is free, while using a hosted LLM means sharing unresolved hunk context with that provider.
Plans and prices
From GitWand's own pricing page, checked 15 Oct 2026.
| Plan | Price | What it gives you |
|---|---|---|
| Free | Free | All core desktop, CLI, VS Code and MCP functionality · MIT licence · no account or seat fee |
The facts
Each one read from GitWand's own pages, with the date it was checked.
What it does
- AI and agents
- GitWand offers an MCP server for AI clients including Claude Code, Cursor, and Windsurf; AI conflict resolution is opt-in.checked 7 Oct 2026
- AI provider choice
- For optional LLM fallback, users configure a provider such as Claude, an OpenAI-compatible endpoint, Ollama, or MCP, and use their own key or endpoint.checked 7 Oct 2026
- AI providers
- AI features can use Claude Code locally, Anthropic’s API, or any OpenAI-compatible endpoint including Azure OpenAI, OpenRouter and self-hosted services.checked 15 Oct 2026
- API stability
- The npm package warns that its pre-1.0 API has no formal semver stability commitment and advises consumers to pin an exact version.checked 15 Oct 2026
- CLI
- The CLI runs through npx or npm, requires Node.js 18 or newer, supports dry-run and verbose modes, and emits CI-oriented JSON with semantic exit codes.checked 15 Oct 2026
- CLI package activity
- The npm CLI page showed version 3.10.1, 54 versions and 418 weekly downloads when crawled.checked 15 Oct 2026
- Confidence and trace
- Each classification includes a composite confidence score and an auditable decision trace.checked 15 Oct 2026
- Configuration
- Repository policies and per-file pattern overrides are configured with .gitwandrc or a gitwand key in package.json.checked 15 Oct 2026
- Conflict engine
- Its classifier uses a prioritised registry and automatically applies eight deterministic resolution patterns while leaving complex cases for review.checked 15 Oct 2026
- Conflict resolution
- Its engine uses deterministic patterns with per-hunk confidence scoring and decision traces to resolve conflicts it classifies as safe.checked 7 Oct 2026
- Git workflow
- Features include visual diffs, hunk-level staging, commit splitting, worktrees, submodule management, and an interactive history graph.checked 7 Oct 2026
- History and branches
- The desktop client provides a graphical Git history, branch operations, stash and tag management, cherry-pick and interactive rebase.checked 15 Oct 2026
- Independent adoption signal
- A GitHub discussion participant said the project’s design and UI looked polished after installing it alongside TortoiseGit and SourceGit.checked 15 Oct 2026
- Independent praise: lightweight operation
- The same reviewer described the tool as light and fast, with signed builds, no telemetry and MIT licensing.checked 15 Oct 2026
- Independent praise: multi-forge workflow
- Coder Legion documented expansion from GitHub-only assumptions to pull requests across GitHub, GitLab, Bitbucket and Azure DevOps.checked 15 Oct 2026
- Independent praise: structural engine
- Coder Legion reported that the engine evolved from text patterns to syntax-tree parsing and added format profiles for JSON and YAML.checked 15 Oct 2026
- Independent praise: traceability
- A Zenn hands-on review praised the readable decision trace and the ability to inspect proposed output before accepting it.checked 15 Oct 2026
- Licence
- GitWand and its published packages are released under the MIT licence.checked 15 Oct 2026
- Limit: conflict-style dependency
- A Zenn test found that default Git conflict markers leave four of ten tested patterns unavailable because no common-ancestor base is supplied.checked 15 Oct 2026
- Limit: inconsistent reporting
- The reviewer found different conflict counts between preview, CLI status and MCP status, and observed trace text that sometimes described the opposite side from the applied result.checked 15 Oct 2026
- Limit: localization
- The same hands-on review reported French messages mixed into the interface and no environment-variable switch to English for those explanations.checked 15 Oct 2026
- Limit: secrets detection
- The Zenn test said the secrets scanner missed a password embedded in a connection string.checked 15 Oct 2026
- Limit: unsafe union result
- That test reported that diff3 or zdiff3 settings could cause a complex GitHub Actions conflict to be unioned and marked resolved, producing duplicate checkout steps.checked 15 Oct 2026
- Local processing
- The site says GitWand runs locally with no account or telemetry, and its MCP server needs no API key or network access.checked 7 Oct 2026
Alternatives to GitWand
- 1
GitHub CodeQL
Free planWebExtensionLinuxmacOS7.5From $30 a month - 2
Gitnuro
Free planOpen sourceLinuxmacOSWindows7.4Free plan - 3
SmartGit
Free planLinuxmacOSWindows7.2From $5 a month - 4
GitButler
Free planLinuxmacOSWindows6.9Free plan - 5
Working Copy
Free planiOS6.8$35.99 one-time - 6
GitComet
Free planLinuxmacOSWindows6.7€20 one-time