# Git Tools

> Git Tools is an open-source MCP server for developer tools. Git status, commits, rebases, worktrees and pushes for coding agents, with guard rails. It runs locally on your machine and is started by your AI client.

- **Kind:** MCP server
- **Pricing:** Open source
- **Platforms:** CLI
- **Repository:** https://github.com/craft-agent/git-tools
- **MCP Registry name:** io.github.craft-agent/git-tools
- **Categories:** [developer tools](https://ai-powered.com/categories/developer-tools)
- **Listing updated:** 2026-11-18

## About

Git Tools gives an agent git operations grouped into five toolsets rather than one raw command line. repo covers local reads: status, history, where a change came from and conflicts, through one read tool that changes nothing and reaches no remote. commit handles staging, the checks before a commit, committing, amending and fixups. rebase covers rebasing, stacked branches rebased together and the rewrite rule. worktree creates, lists and removes worktrees, and push pushes one or more branches against the remote commit each is expected to have. The first three are on by default; worktree and push are opt-in.

It works against any git remote. Pull requests and GitHub's native stacks belong to the sister package github-tools. Where origin is on GitHub, a few safety checks also read it, authenticated as you. It needs Node.js 24 or later and git.

Each toolset has a skill that explains when to use each method. Delivery depends on the harness: a native plugin for OpenCode, a plugin with MCP server and skills for Claude Code, Codex, Grok Build and Antigravity, a Python plugin for Hermes, or the npm package for any other MCP host. A read-only flag is available.

## Features

- **Five toolsets:** repo, commit, rebase, worktree and push, with the first three on by default.
- **Read-only repo tool:** One method-based tool reads status, history, origin of a change and conflicts.
- **Stacked rebases:** Rebase stacked branches together under a rewrite rule.
- **Expected-commit pushes:** Push each branch against the remote commit it is expected to have.
- **Worktree support:** Create, list and remove worktrees.
- **Skills included:** Each toolset has a skill describing when to use each method.

## Good for

- Let an agent stage and commit with checks run first
- Rebase a stack of branches in one step
- Find where a change came from and resolve conflicts
- Push several branches safely
- Manage worktrees for parallel tasks

## Install

### Claude Code (Terminal)

```sh
claude mcp add git-tools -- npx -y @craftsamo/git-tools
```

### Claude Desktop (claude_desktop_config.json)

```json
{
  "mcpServers": {
    "git-tools": {
      "command": "npx",
      "args": [
        "-y",
        "@craftsamo/git-tools"
      ]
    }
  }
}
```

### Cursor (~/.cursor/mcp.json)

```json
{
  "mcpServers": {
    "git-tools": {
      "command": "npx",
      "args": [
        "-y",
        "@craftsamo/git-tools"
      ]
    }
  }
}
```

### VS Code (.vscode/mcp.json)

```json
{
  "servers": {
    "git-tools": {
      "type": "stdio",
      "command": "npx",
      "args": [
        "-y",
        "@craftsamo/git-tools"
      ]
    }
  }
}
```

### Windsurf (~/.codeium/windsurf/mcp_config.json)

```json
{
  "mcpServers": {
    "git-tools": {
      "command": "npx",
      "args": [
        "-y",
        "@craftsamo/git-tools"
      ]
    }
  }
}
```

### Other clients (your client's MCP settings (most use this shape))

```json
{
  "mcpServers": {
    "git-tools": {
      "command": "npx",
      "args": [
        "-y",
        "@craftsamo/git-tools"
      ]
    }
  }
}
```

## FAQ

### Which toolsets are on by default?

repo, commit and rebase; worktree and push are opt-in.

### Does it handle pull requests?

No. Pull requests and native stacks on GitHub are in the sister package github-tools.

### What does it need?

Node.js 24 or later and git.

### Does it work with non-GitHub remotes?

Yes, it works against any git remote.

### Is Git Tools free?

Yes. Git Tools is open source, so you can use and self-host it for free.

### How do I add Git Tools to Claude Code?

Run this command in your terminal: claude mcp add git-tools -- npx -y @craftsamo/git-tools

### What are the best alternatives to Git Tools?

The closest alternatives to Git Tools are REA, Context7, Chrome DevTools MCP, Codebase Memory and GitHub.

## Where this comes from

- Description: written from the project's README.
- Install steps: from the official MCP Registry entry.

## Alternatives

- [REA](https://ai-powered.com/mcp/rea): REA is an open-source MCP server for developer tools.
- [Context7](https://ai-powered.com/mcp/context7): Context7 is a freemium MCP server for developer tools.
- [Chrome DevTools MCP](https://ai-powered.com/mcp/chrome-devtools-mcp-2): Chrome DevTools MCP is an open-source MCP server for browser automation.
- [Codebase Memory](https://ai-powered.com/mcp/codebase-memory): Codebase Memory is an open-source MCP server for knowledge and memory.
- [GitHub](https://ai-powered.com/mcp/github-2): GitHub is an open-source MCP server for developer tools.
- [Serena MCP: the IDE for your agent](https://ai-powered.com/mcp/serena-mcp-the-ide-for-your-agent): Serena MCP: the IDE for your agent is an open-source MCP server for developer tools.
- [awesome-mcp-servers](https://ai-powered.com/mcp/awesome-mcp-servers-2): awesome-mcp-servers is an open-source MCP server for developer tools.
- [XERJ](https://ai-powered.com/mcp/xerj): XERJ is an open-source MCP server for knowledge and memory.

---
Source: https://ai-powered.com/mcp/git-tools
