Git vs Gitwand

A side-by-side look at the Git and Gitwand MCP servers: transport, auth, tools, quality signals, and the config to install either one in Claude, Cursor, Windsurf or VS Code.

Git logoGitVersion Control · Local subprocess (stdio)Tools to read, search, and manipulate Git repositories.81ExcellentAuth: no auth requiredGitwand logoGitwandVersion Control · Local subprocess (stdio)Auto-resolves Git merge conflicts so agents only touch the complex hunks.60GoodAuth: not declared

Verdict: choose Git for version control work as a local process; choose Gitwand for version control as a local process. You can also run both side by side in one mcpServers block.

Which MCP server should you choose?

Git logoChoose Git when

  • You need dedicated capabilities in the Version Control domain.
  • You prefer a local stdio subprocess transport.
  • Its auth model fits you: No auth required.
  • You want tools like repo_path, context_lines, target.
Explore Git

Gitwand logoChoose Gitwand when

  • You need dedicated capabilities in the Version Control domain.
  • You prefer a local stdio subprocess transport.
  • You want tools like gitwand_status, gitwand_resolve_conflicts, gitwand_preview_merge.
Explore Gitwand

Feature & specification comparison

Rows where the two servers differ are marked.

SpecGit logoGitGitwand logoGitwand
CategoryVersion ControlVersion Control
Quality signal81/100 · Excellent60/100 · Good
Install commandConfirmedConfirmed
TransportLocal subprocess (stdio)Local subprocess (stdio)
AuthNo auth requiredNot declared
PricingFreeFree
Required env varsNone listedNone listed
Verified owner VerifiedCommunity listing
GitHub stars91,487186
Directory activity 49 views 0 installs 0 upvotes 1 views 0 installs 0 upvotes
Tools167

Tools & capabilities

Git tools 16

  • repo_path
  • context_lines
  • target
  • message
  • MERGE_HEAD
  • HEAD
  • files
  • max_count
  • start_timestamp
  • end_timestamp
  • branch_name
  • base_branch
  • +4 more on the listing page

Gitwand tools 7

  • gitwand_statusList conflicted files with their complexity and auto-resolvability
  • gitwand_resolve_conflictsAuto-resolve trivial conflicts, return DecisionTrace + pendingHunks
  • gitwand_preview_mergeDry-run resolution — stats and risk assessment without writing files
  • gitwand_explain_hunkExplain why a specific hunk was classified its type (full trace + context)
  • gitwand_apply_resolutionApply a custom (LLM-provided) resolution to a specific complex hunk
  • gitwand_resolve_hunkAsk the connected agent to propose a resolution for one pending hunk (ours/theirs/base + trace returned)
  • gitwand_resolve_hunk_llmValidate an LLM-proposed resolution through the post-merge gate, then apply it to disk

Ready-to-paste client configs

Paste either block (or both) into your client config, e.g. claude_desktop_config.json or ~/.cursor/mcp.json. We only show a config when the install command is confirmed.

Git

mcpServers (Claude Desktop / Cursor)
{
  "mcpServers": {
    "git": {
      "command": "uvx",
      "args": [
        "installations"
      ]
    }
  }
}

Gitwand

mcpServers (Claude Desktop / Cursor)
{
  "mcpServers": {
    "gitwand": {
      "command": "npx",
      "args": [
        "-y",
        "@gitwand/mcp"
      ]
    }
  }
}

Frequently asked questions

Git is categorized under Version Control and uses a local stdio subprocess. Gitwand belongs to Version Control and uses a local stdio subprocess. Pick Git for version control work and Gitwand for version control.

Copy the mcpServers block from the config section on this page into your client's config (for example claude_desktop_config.json or ~/.cursor/mcp.json), then fully restart the client.

Git is listed as free. Auth: no auth required. Gitwand is listed as free. If a server needs environment variables such as API keys, define them under the env key in your client's MCP config.

Yes. MCP clients support multiple servers: add git and gitwand as separate keys in the same mcpServers object, and your assistant will call tools from either one.

On AllMCPs, Git has a quality signal of 81/100 (Excellent) with 49 views, 0 installs and 91,487 GitHub stars. Gitwand has 60/100 (Good) with 1 views, 0 installs and 186 GitHub stars.