Git MCP Server

Exposes git status information through MCP tools that parse the output of `git status` and `git diff` commands, enabling clients to understand which files are staged, unstaged, untracked, or conflicted. The server executes git commands in the target repository and structures the raw output into JSON-RPC responses that clients can consume programmatically. This allows LLM agents to make informed decisions about which files to commit or review before staging changes.

Implements git log inspection through MCP tools that execute `git log` with customizable filters (author, date range, commit message pattern) and return structured commit metadata including hash, author, timestamp, and message body. The server parses git log output into JSON arrays that clients can iterate over to understand repository history, identify breaking changes, or trace feature origins. Supports both short and full commit details with optional diff inclusion.

Provides MCP tools for creating, listing, applying, and deleting git stashes using `git stash` commands. The server supports stashing uncommitted changes with optional messages, listing stash history with metadata, applying stashes to current branch, and cleaning up old stashes. Implements conflict detection when applying stashes and provides guidance for resolution. Returns structured stash data including creation date, author, and associated changes.

Implements MCP tools for interactive rebasing and history rewriting using `git rebase` commands with safety validation. The server supports rebasing onto different branches, squashing commits, reordering commits, and editing commit messages. Implements conflict detection during rebase and provides guidance for conflict resolution. Validates that rebase operations are safe (no force push to shared branches) and returns structured rebase status including success/failure and conflict information.

Provides MCP tools for listing branches, creating new branches, switching branches, and detecting merge conflicts before checkout. The server executes `git branch`, `git checkout`, and `git merge --no-commit` commands to validate branch operations and report conflicts. Implements path validation to ensure branch operations target legitimate repository locations and prevents directory traversal attacks. Returns structured data about branch state, tracking relationships, and conflict markers.

Exposes MCP tools for staging and unstaging files using `git add` and `git reset` commands, with optional content validation to ensure files are in expected state before modification. The server parses git index state before and after operations to confirm changes took effect. Supports partial staging via `git add --patch` simulation (line-by-line staging) and validates that staged content matches expected diffs. Implements path normalization and validation to prevent staging files outside the repository.

Implements MCP tools for creating commits with structured message validation, author/committer attribution, and optional GPG signing. The server executes `git commit` with validated message content, author name/email, and optional signing key. Validates commit messages against configurable patterns (e.g., conventional commits format) before execution. Returns commit hash, author info, and timestamp. Supports amending previous commits and creating commits with custom author information for automation workflows.

Provides MCP tools for generating diffs between arbitrary commits, branches, or working directory state using `git diff` and `git show` commands. The server supports unified diff format, stat-only diffs (file change counts), and patch generation. Implements diff filtering by file type/path and supports both full repository diffs and single-file comparisons. Returns structured diff data with file-level metadata (additions, deletions, renames) and optional line-by-line change details.

Implements MCP resource discovery that identifies git repository roots and validates file paths to prevent directory traversal attacks. The server executes `git rev-parse --show-toplevel` to locate repository root, caches the result, and validates all subsequent file operations against this root. Implements path normalization using Python's `pathlib` to resolve `..` and symlink traversal attempts. Returns repository metadata including root path, bare repository status, and working directory state.

Provides MCP tools for detecting merge conflicts before committing merges, analyzing conflict markers in files, and providing structured guidance for resolution. The server executes `git merge --no-commit` to simulate merges without committing, parses conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`), and returns structured conflict data including file paths, conflicting sections, and base/ours/theirs versions. Supports conflict resolution strategies (ours, theirs, manual) and validates resolution before completion.

Provides MCP tools for fetching from and pulling from remote repositories using `git fetch` and `git pull` commands. The server executes remote operations with configurable remote names (origin, upstream, etc.) and branches. Implements network error handling and timeout management for slow connections. Returns structured data about fetched commits, updated branches, and any conflicts detected during pull. Supports dry-run mode to preview changes before pulling.

Implements MCP tools for creating, listing, and inspecting git tags using `git tag` and `git show` commands. The server supports both lightweight tags (simple references) and annotated tags (full objects with metadata). Provides tag filtering by pattern, sorting by version or date, and retrieval of tag metadata including tagger, date, and message. Supports tag deletion and validation that tags point to valid commits.