Skip to the content
Know your tech before you buy it. Makers: get listed from $49/mo

GitWand

gitwand.app

  • Free plan
  • Open source
  • Windows
  • macOS
  • Linux
  • Browser extension
  • API
  • Self-hosted
8.1 Club score Visit gitwand.app

What GitWand is

GitWand is a native Git client with desktop, command-line, and VS Code interfaces for local repositories, regardless of hosting service. Its 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, including comments, reviews, CI status, and conflict previews. For conflicts classified as safe, its engine uses deterministic patterns, confidence scores, and decision traces. Token-level merges are proposed for confirmation, while complex cases are surfaced for review. AI conflict resolution is optional, and users can configure providers such as Claude, an OpenAI-compatible endpoint, Ollama, or MCP using their own key or endpoint. GitWand also 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 needs no API key or network access. If a hosted LLM provider is selected, unresolved hunks and surrounding context are sent to that provider. GitWand is free under the MIT license, with no seat license or account requirement.

Who it suits

GitWand suits developers who want a local Git client with desktop, CLI, or VS Code interfaces and pull request review tools. Its optional AI conflict features may suit users who want to choose an LLM provider, while those selecting hosted providers should consider what context is sent.

Good to know, and what to watch

  • Works with local repositories regardless of hosting service.
  • Includes visual diffs and hunk-level staging.
  • Supports pull request reviews across four listed services.
  • Runs locally without an account or telemetry, according to the product.
  • Free under the MIT license with no seat license.
  • Hosted LLM use sends unresolved hunks and context to that provider.
  • AI conflict resolution is optional and requires provider configuration.
  • Complex conflicts are surfaced for review.

Free

Free

Free plan

The verdict

GitWand combines core Git workflows, pull request review, and optional conflict assistance in a free client. Its local operation is a useful distinction, but hosted LLM use sends conflict context externally to the selected provider.

What the maker publishes

AI and agents
GitWand offers an MCP server for AI clients including Claude Code, Cursor, and Windsurf; AI conflict resolution is opt-in. source
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. source
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. source
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. source
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. source
CLI package activity
The npm CLI page showed version 3.10.1, 54 versions and 418 weekly downloads when crawled. source
Confidence and trace
Each classification includes a composite confidence score and an auditable decision trace. source
Configuration
Repository policies and per-file pattern overrides are configured with .gitwandrc or a gitwand key in package.json. source
Conflict engine
Its classifier uses a prioritised registry and automatically applies eight deterministic resolution patterns while leaving complex cases for review. source
Conflict resolution
Its engine uses deterministic patterns with per-hunk confidence scoring and decision traces to resolve conflicts it classifies as safe. source
Git workflow
Features include visual diffs, hunk-level staging, commit splitting, worktrees, submodule management, and an interactive history graph. source
History and branches
The desktop client provides a graphical Git history, branch operations, stash and tag management, cherry-pick and interactive rebase. source
Independent adoption signal
A GitHub discussion participant said the project’s design and UI looked polished after installing it alongside TortoiseGit and SourceGit. source
Independent praise: lightweight operation
The same reviewer described the tool as light and fast, with signed builds, no telemetry and MIT licensing. source
Independent praise: multi-forge workflow
Coder Legion documented expansion from GitHub-only assumptions to pull requests across GitHub, GitLab, Bitbucket and Azure DevOps. source
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. source
Independent praise: traceability
A Zenn hands-on review praised the readable decision trace and the ability to inspect proposed output before accepting it. source
Licence
GitWand and its published packages are released under the MIT licence. source
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. source
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. source
Limit: localization
The same hands-on review reported French messages mixed into the interface and no environment-variable switch to English for those explanations. source
Limit: secrets detection
The Zenn test said the secrets scanner missed a password embedded in a connection string. source
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. source
Local processing
The site says GitWand runs locally with no account or telemetry, and its MCP server needs no API key or network access. source

Checked against the maker's pages on 15 Oct 2026.