Tools to read, search, and manipulate Git repositories
## Git MCP Server: Version Control from Your AI Assistant The **Git MCP Server** integrates Git version control directly into Google Antigravity, enabling you to manage repositories, branches, commits, and history through natural language commands. Never leave your IDE to handle version control tasks again. ### Why Git MCP? Git is the backbone of modern software development. The Git MCP makes version control conversational: - **Branch Management**: Create, switch, and merge branches naturally - **Commit Operations**: Stage, commit, and push with simple commands - **History Exploration**: Navigate and understand project history - **Conflict Resolution**: Get help resolving merge conflicts - **Collaboration**: Manage remotes and sync with team members ### Key Features #### 1. Repository Operations Manage repositories effortlessly: ``` "Initialize a new git repository" "Clone the repository from GitHub" "Show the current repository status" "List all configured remotes" ``` #### 2. Branch Management Work with branches naturally: ``` "Create a new branch called feature/auth" "Switch to the develop branch" "List all branches including remote" "Delete the merged feature branch" "Rename the current branch to feature/login" ``` Operations: - Create and delete branches - Switch between branches - Track remote branches - Set upstream branches #### 3. Commit Workflow Handle commits conversationally: ``` "Stage all modified files" "Commit with message: Fix authentication bug" "Amend the last commit message" "Show what will be committed" "Unstage the config file" ``` Features: - Selective staging - Commit message generation - Amend and squash commits - Interactive staging #### 4. History and Logs Explore repository history: ``` "Show the last 10 commits" "What changed in the previous commit?" "Find commits that modified the auth file" "Show the commit graph for this branch" "Who last modified this line?" ``` #### 5. Merge and Rebase Handle integration workflows: ``` "Merge develop into main" "Rebase feature branch onto main" "Cherry-pick commit abc123" "Abort the current merge" ``` ### Configuration Set up Git MCP: ```json { "mcpServers": { "git": { "command": "npx", "args": ["-y", "@modelcontextprotocol/server-git"], "env": { "GIT_DEFAULT_BRANCH": "main" } } } } ``` ### Common Workflows #### Feature Development ``` 1. "Create branch feature/user-profile" 2. [Make your changes] 3. "Stage all changes" 4. "Commit: Add user profile component" 5. "Push to origin" 6. "Create pull request" ``` #### Bug Fix ``` 1. "Stash current changes" 2. "Switch to main branch" 3. "Create hotfix branch" 4. [Fix the bug] 5. "Commit and push" 6. "Switch back and restore stash" ``` #### Release Preparation ``` 1. "Show commits since last tag" 2. "Merge develop into main" 3. "Create tag v1.2.0" 4. "Push main with tags" ``` ### Best Practices 1. **Meaningful Commits**: Write clear, descriptive commit messages 2. **Branch Often**: Create branches for features and fixes 3. **Pull Before Push**: Sync with remote before pushing 4. **Review Changes**: Always check what you're committing 5. **Tag Releases**: Use tags for version milestones ### Conflict Resolution Get help with merge conflicts: ``` "Show files with conflicts" "What are the conflicts in app.js?" "Accept the incoming changes" "Mark conflict as resolved" ``` ### Stash Operations Manage work in progress: ``` "Stash my current changes" "List all stashes" "Apply the most recent stash" "Drop the oldest stash" ``` ### Remote Operations Work with remote repositories: ``` "Add a new remote called upstream" "Fetch all remotes" "Push to the backup remote" "Prune deleted remote branches" ``` ### Git Configuration Manage Git settings: ``` "Show git configuration" "Set user email for this repository" "Configure default pull strategy to rebase" ``` ### Advanced Features #### Bisect for Bug Finding ``` "Start bisect between v1.0 and HEAD" "Mark current commit as bad" "Mark this commit as good" ``` #### Submodules ``` "List all submodules" "Update submodules recursively" "Add a new submodule" ``` #### Worktrees ``` "Create a worktree for testing" "List all worktrees" "Remove the testing worktree" ``` ### Security Considerations - Keep credentials secure (use credential helpers) - Don't commit sensitive files (.env, secrets) - Use signed commits for verification - Review changes before committing - Audit repository access ### Integration with Development The Git MCP enhances your workflow: - Commit after code changes without context switching - Quick branch operations during development - Easy history navigation for debugging - Seamless integration with GitHub/GitLab MCPs The Git MCP Server transforms version control from a command-line task into a natural conversation, making Git accessible and efficient for developers of all experience levels.
{
"mcpServers": {
"git": {
"args": [
"mcp-server-git",
"--repository",
"path/to/git/repo"
],
"command": "uvx"
}
}
}