Git MCP Server

Exposes git status information through MCP tool interface by invoking git status command and parsing output to surface staged/unstaged changes, untracked files, and branch state. Implements path validation security layer to prevent directory traversal attacks before executing git commands, ensuring only authorized repository paths are queried. Returns structured JSON representation of repository state including file modification status, merge conflicts, and detached HEAD state.

Generates unified diffs between repository states (working tree vs HEAD, staged vs unstaged, arbitrary commits) by invoking git diff with configurable context lines. Supports filtering diffs by file path patterns to reduce token consumption in LLM context. Implements streaming output for large diffs to avoid memory exhaustion, returning diff hunks as structured objects with line numbers and change indicators.

Manages git stash through MCP tools supporting save, apply, pop, and list operations. Implements stash creation with optional messages for context. Supports selective stashing of specific files or hunks. Returns stash list with metadata including creation date, branch, and message. Implements safety validation to prevent data loss during stash operations. Supports stash application with conflict detection.

Applies specific commits to the current branch through git cherry-pick with conflict detection and handling. Implements commit selection by hash or range specification. Supports abort operations to cancel in-progress cherry-picks. Returns operation status and conflict details if cherry-pick results in conflicts. Validates that cherry-picked commits are not already in the current branch history.

Provides git log inspection through MCP tools supporting commit traversal by date range, author, file path, or commit message pattern. Implements git blame functionality to attribute each line to specific commits, enabling line-level change history. Returns commit metadata (hash, author, timestamp, message, parent references) in structured JSON format. Supports ancestry path filtering to trace specific feature branches through history.

Manages git branches and references (tags, remote tracking branches) through MCP tools supporting creation, deletion, switching, and listing operations. Implements safety validation to prevent destructive operations on protected branches (main, master, develop by default, configurable). Supports branch creation from arbitrary commit references and tracks upstream relationships. Returns branch metadata including tracking status, last commit, and merge base information.

Manages git staging area (index) through MCP tools supporting add, remove, and reset operations on individual files or patterns. Detects merge conflicts before staging operations and prevents staging of conflicted files. Supports partial staging through git add --patch simulation (interactive hunk selection). Returns staging state changes and conflict information. Implements path validation to prevent staging files outside repository root.

Creates commits through MCP tools with support for custom commit messages, co-author attribution, and message templates. Validates commit messages against configurable rules (minimum length, required prefixes like 'feat:', 'fix:'). Supports amending previous commits and creating commits with specific author metadata. Implements pre-commit hook simulation to validate staged changes before commit creation. Returns commit hash and metadata of created commit.

Discovers git repositories in the filesystem and resolves repository root paths through MCP roots capability. Implements recursive directory traversal to find .git directories and validates repository integrity. Supports multiple repository roots for monorepo scenarios. Returns repository metadata including path, branch, remote URLs, and repository size. Implements security validation to prevent access to repositories outside configured allowed paths.

Synchronizes local repository with remote repositories through MCP tools supporting fetch, pull, and push operations. Implements credential handling through git credential helper integration (no embedded credentials). Supports force push with safety warnings and branch tracking configuration. Detects merge conflicts during pull operations and reports them before completing. Returns operation status and updated branch tracking information.

Performs merge and rebase operations through MCP tools with conflict detection and resolution guidance. Implements three-way merge detection and reports conflict markers (<<<, ===, >>>) with context. Supports abort operations to cancel in-progress merges/rebases. Provides merge strategy selection (recursive, resolve, ours, theirs). Returns operation status and conflict details requiring manual resolution or automated resolution hints.

Creates and manages git tags through MCP tools supporting lightweight and annotated tags. Implements tag listing with filtering by pattern or date range. Supports tag deletion with safety validation to prevent accidental loss of release tags. Returns tag metadata including creation date, tagger, message, and target commit. Implements security validation to prevent tag operations outside repository root.