Git MCP Server

git-mcp

A Git MCP server that doesn't suck

Exposes the full Git workflow to any MCP-compatible AI agent — inspect, write, branch, remote, stash, rebase, LFS, git-flow, documentation lookup, and more. Designed to be safe by default, composable, and fast. Powered by simple-git.

Built for coding agents in tools like GitHub Copilot, Claude Code, Cursor, and OpenAI Codex, while remaining compatible with any MCP client that can call tools and resources.

---

Features

• 18 tools with 80+ actions covering everyday Git workflows, advanced recovery, history rewriting, repository analytics, forge pull requests, and external VCS awareness
• Safety-first — destructive operations require explicit confirmation; force push and hook bypass are opt-in via server config
• GPG/SSH signing for commits and tags, with server-level auto-sign support
• Git LFS — track patterns, manage objects, install hooks, migrate history
• Git Flow — drives the git-flow-next CLI, so the finish state machine, conflict recovery, and worktree lifecycle stay correct as the CLI evolves. Preset init, overview, config CRUD, generalized topic actions, and classic feature/release/hotfix/support aliases
• Documentation lookup — search git-scm.com and fetch man pages directly from the LLM
• MCP Resources — URI-addressable read-only views of status, log, branches, and diff
• Bundled agent skill — skills/git-mcp-workflow/ documents MCP-first Git workflows, recovery, worktrees, releases, and advanced operations for AI agents and coding agents; installable via skills-npm and skill.sh
• External VCS awareness — git_but_check / git_jj_check detect GitButler and Jujutsu and guide agents to prefer their native CLIs/MCP (with but teardown guidance) over git-mcp tools when appropriate
• History rewrite — git_rewrite: reword, squash, rewrite-messages, and backup/restore for safe commit-history rewriting
• Repository analytics — git_analytics: contributors, churn, activity, summary, and file-stats computed from local git history
• Pull requests — git_pr: create/list/merge PRs/MRs on GitHub, GitLab, Forgejo, Gitea, and Bitbucket via provider CLI or REST API
• Tangled & Entire awareness — git_tangled_check / git_entire_check detect Tangled hosting and Entire session/context management
• Multi-repo — pass repo_path per-call or configure a server-level default
• Worktrees — git_worktree: plain git worktree by path, or branch-addressed worktrees via git flow worktree with path templates and provenance-aware cleanup
• Cross-platform — macOS, Linux, Windows (Git for Windows), all covered by CI

---

Quick Start

npx (no install)

npx @selfagency/git-mcp --repo-path /path/to/your/repo

Install globally

npm install -g @selfagency/git-mcp
git-mcp --repo-path /path/to/your/repo

Claude Desktop

Add to ~/Library/Application Support/Claude/claude_desktop_config.json:

{
  "mcpServers": {
    "git": {
      "command": "npx",
      "args": ["-y", "@selfagency/git-mcp", "--repo-path", "/path/to/your/repo"]
    }
  }
}

VS Code (Copilot)

Add to .vscode/mcp.json in your project:

{
  "servers": {
    "git": {
      "command": "npx",
      "args": ["-y", "@selfagency/git-mcp", "--repo-path", "${workspaceFolder}"]
    }
  }
}

---

Configuration

All configuration is via environment variables. Pass them in your MCP client config:

---

Tool Reference

Tools are grouped by domain. Each root tool takes an action parameter that selects the operation. Where an action is marked as default, omitting action will use it.

Context (git_context)

Status (git_status)

History (git_history)

Commits (git_commits)

Branches (git_branches)

Remotes (git_remotes)

Workspace (git_workspace)

Git Flow (git_flow)

Drives the git-flow-next CLI, which must be installed and on PATH (brew install git-flow-next, or the releases page). Set GIT_FLOW_BINARY to override the path. When the binary is missing, the tool returns an install hint rather than failing opaquely.

Flags are scoped to the target verb: worktree and worktree_path apply to start and checkout, while keep_worktree and force_worktree apply to finish and delete. A mismatch raises instead of being silently dropped. See the tool reference for the full parameter list.

Worktree (git_worktree)

Two backends. Path-addressed actions drive plain git worktree and need nothing but git; branch-addressed flow_* actions drive git flow worktree, which addresses worktrees by branch name, computes paths from the gitflow.worktreePath template, and tags provenance so cleanup can tell a git-flow-created worktree (removed) from a hand-made one (detached, uncommitted work preserved).

See the tool reference.

LFS (git_lfs)

Documentation (git_docs)

History Rewrite (git_rewrite)

Analytics (git_analytics)

Pull Requests (git_pr)

Uses the provider CLI (gh/glab/tea) when installed locally, otherwise the REST API with a *_TOKEN env var. Provider auto-detected from the origin remote; self-hosted instances use GIT_FORGE_PROVIDER.

External VCS Awareness

Health Check (git_ping)

Returns server status. Useful for confirming the server is reachable.

---

MCP Resources

URI-addressable read-only snapshots (subscribe-capable):

---

Bundled Agent Skill

git-mcp ships a bundled agent skill at skills/git-mcp-workflow/ that teaches any skills-npm-compatible agent to use the MCP tool surface instead of running raw git CLI commands. The skill covers:

• Why LLMs must not use the Git CLI (quoting hazards, silent failures)
• Inspect-before-mutate workflow rules
• Safety order for undo and recovery operations
• Full registered tool surface with action reference
• Workflow playbooks: feature branch, rebase, recovery, worktree, backport, release tagging, Git Flow, merge
• Git concept explanations anchored to MCP tools

Installing the skill

If your agent supports skills-npm:

npm install @selfagency/git-mcp   # or pnpm/yarn
npx skills-npm

Or add to your project's package.json so it runs automatically:

{
  "scripts": {
    "prepare": "skills-npm"
  }
}

Then add to .gitignore:

skills/npm-*

---

Safety

• All mutating tools have destructiveHint: true in their MCP annotations
• git_commits action=reset mode=hard requires confirm=true
• git_commits action=nuke requires confirm=true
• Force push (--force) is disabled unless GIT_ALLOW_FORCE_PUSH=true; force_with_lease is always available
• Hook bypass (--no-verify) is disabled unless GIT_ALLOW_NO_VERIFY=true
• git_flow hook and filter execution is disabled unless GIT_ALLOW_FLOW_HOOKS=true
• Paths are validated against the repository root — traversal attempts are rejected
• Credentials and tokens are never included in responses

---

Development

# Clone and install
git clone https://github.com/selfagency/git-mcp.git
cd git-mcp
pnpm install

# Run in development mode (hot reload)
pnpm dev

# Build
pnpm build

# Run tests
pnpm test

# Type check
pnpm typecheck

# Lint
pnpm lint

# Docs (dev server)
pnpm docs:dev

# Docs (build)
pnpm docs:build

---

License

MIT © Daniel Sieradski