GitPeak — Visual Git for VS Code: Commit Graph, Merge Conflict Resolver & Git GUI
Git commit graph, visual merge conflict resolution, and safe everyday Git in one free VS Code extension.
An open alternative to GitLens and Git Graph. Works with GitHub, GitLab, Bitbucket and self-hosted Gitea. No telemetry by default, fully offline.
What's new
·
Install
·
Conflict Center
·
MCP for AI agents
·
FAQ
▶ Quick view
▶ Watch the 42-second tour on YouTube
✨ Features at a glance
|
|
| 🌳 Real commit graph |
Multi-lane branches and merges you can actually read, not a flat list |
| 🧩 Visual merge conflict resolution |
Three panes (Yours · Result · Theirs), per-hunk accept, optional AI resolve |
| 🛡️ Smart Checkout |
Auto-stash, switch, restore. A dirty tree never blocks you |
| 🔀 Interactive rebase GUI |
Drag to reorder, squash, reword, with one-click undo |
| 🍒 Cherry-pick preview |
See touched files and predicted conflicts before you apply it |
| 🤖 MCP server for AI agents |
Copilot, Claude Code and other MCP clients get structured Git context |
| 🧠 Optional AI (BYOK) |
Commit messages and explanations: OpenAI-compatible, Anthropic, Ollama, LM Studio, MiniMax |
| 🌐 Multi-remote & Gitea |
Push/fetch all remotes at once, with first-class self-hosted Gitea support |
| 🔒 Private by default |
No telemetry by default, fully offline-capable, air-gapped ready |
Install
- VS Code: search GitPeak in the Extensions view, or install from the Visual Studio Marketplace.
- Cursor, Windsurf, VSCodium, Gitpod, Eclipse Theia: install from Open VSX.
- Command line:
code --install-extension NotifyX.gitpeak
Then open any folder with a Git repository and click the GitPeak icon in the Activity Bar. Your commit graph, changes and branches load instantly.
Beginner-friendly defaults are on from the first launch. Flip the Pro toggle anytime to reveal the full power set. There's nothing to configure and nothing to learn up front.
Why GitPeak
Most Git tools make you choose: powerful or approachable. GitPeak refuses the tradeoff. Every surface follows one principle:
Fast for experts. Safe for beginners. Visual for everyone.
Advanced features are there the moment you want them and out of the way until then. You don't need to learn anything before your first commit, and nothing is missing when you're rebasing five branches before lunch.
- It actually shows your history. A true multi-lane commit graph, with real branches and real merges, not a flat list pretending to be one.
- Conflicts stop being scary. A three-pane resolver with per-hunk accept and optional one-click AI resolution.
- You never lose work. Smart Checkout stashes, switches and restores for you. Safe Push warns before force. No silent surprises.
- It respects you. No telemetry by default. Works fully offline. Runs in air-gapped and government environments, including first-class Gitea support.
Resolve merge conflicts visually
The Conflict Center replaces raw <<<<<<< markers with three synchronized panes: your branch, the editable result, and the incoming branch. Accept a side, accept both, or edit by hand, one hunk at a time. Arrows stay locked to the hunk they act on while you scroll. Click Resolve & Stage, and the file that's staged is byte-for-byte what you see in the Result pane.
A commit graph you can read at a glance
Branches and merges render as real lanes with color. Click any commit to see its changed files with +/− counts, then click a file to open a side-by-side diff. History becomes something you explore, not squint at.
Commit with confidence
A clean message box and one Commit All button by default, with every advanced tool behind an opt-in. Generate a conventional-commit message with AI, or just type and ship. Click any changed file to preview the diff before you stage it.
Push and pull without surprises
The Sync Center shows where your branch stands before you act: ahead/behind, incoming and outgoing commits, and working-tree changes. The safe next action is one click away: push, fetch, merge a branch, or rebase onto another.
Branches and remotes, minus the clutter
Slim, single-line branches with type-aware accents and actions that appear only on hover. Manage multiple remotes and push or fetch them all at once, with provider auto-detection for GitHub, GitLab, Bitbucket and Gitea.
For AI coding agents (MCP server)
GitPeak ships a local Model Context Protocol server, so coding agents read Git state as structured JSON instead of scraping git output from a terminal.
- VS Code 1.101+: nothing to set up. GitPeak registers itself under MCP Servers, and Copilot and other MCP-aware extensions pick it up automatically.
- Claude Code: set
"gitpeak.mcp.configureClaudeCode": true. GitPeak adds a single gitpeak entry to ~/.claude.json and changes nothing else in it.
- Any other MCP client (Cursor, Windsurf, Claude Desktop…): use the
gitpeak-mcp package: npx -y gitpeak-mcp. It's the same server, and it's also listed in the MCP Registry as io.github.awalhadi/gitpeak.
- A whole team: run GitPeak: Share MCP Setup with Team and commit the files it writes (
.vscode/mcp.json, .mcp.json, .cursor/mcp.json, whichever you pick). The entry is npx -y gitpeak-mcp, with no paths or versions in it, so it's identical on every machine and never causes merge conflicts. Teammates need Node.js.
GitPeak itself never writes into your repository. Older versions wrote a .claude/mcp.json containing a path specific to each machine, which conflicted between teammates. GitPeak now removes that entry once in each repo. Every teammate's GitPeak makes the identical change, so the cleanup merges cleanly.
| Tool |
What the agent gets |
gitpeak_repo_status |
Branch, ahead/behind, staged / unstaged / untracked / conflicted files, merge or rebase in progress |
gitpeak_diff |
Working-tree changes, or a branch compared with its base like a pull request: every file with +/−, then a patch that fits the context window (lockfiles and binaries summarised, not dumped) |
gitpeak_staged_diff |
What the next commit contains, for writing commit messages or reviewing what was staged |
gitpeak_commit_log |
Commits filtered by branch or range, path, author, message or date, with AI-agent commit detection |
gitpeak_show_commit |
One commit: full message and its changes |
gitpeak_branches |
Branches by recent activity, with upstream and ahead/behind |
gitpeak_merge_risk |
The exact files a merge would conflict in (a real in-memory merge that changes nothing), plus a 0–100 risk score |
gitpeak_blame_line |
Every commit that touched a line, newest first |
gitpeak_health |
Repo health score, stale branches, secret-leak warnings, never-pushed branches |
gitpeak_worktrees |
All worktrees with branch and status |
All tools are read-only: the server never changes your repository. Each takes an optional repo path.
The server runs entirely on your machine. Turn it off with "gitpeak.features.mcp": false.
Everything inside
Visualize
- Multi-lane commit graph with merge curves, refs and tags
- Commit detail on click: changed files with +/− counts, each opening a real diff
- Inline blame and file history
Do the everyday safely
- One-click stage, Commit All, push and pull with Safe Push (force-with-lease, pre-push checks)
- Smart Checkout: auto-stash, switch, restore. A dirty tree never blocks you
- Side-by-side diff preview for staged, unstaged and untracked files
Master the hard parts
- Three-pane Conflict Center (Yours · Result · Theirs) with per-hunk accept, AI resolve, and Simple and Advanced modes
- Interactive Rebase GUI: drag to reorder, squash, reword, with safety guards and one-click undo
- Cherry-pick with a preview of touched files, line counts and conflict prediction
Work like a team
- Multi-remote management with one-click Fetch all / Push to all
- Tags, stash manager and worktree support
- Optional AI commit messages and commit explanations (bring your own provider: OpenAI-compatible, Anthropic, Ollama, LM Studio, MiniMax)
- Repository Health dashboard
- MCP server for Copilot, Claude Code and other AI coding agents
Built for the enterprise
- No telemetry by default. Usage metrics are opt-in only and never include file contents, diffs, paths or keys.
- Fully offline / air-gapped capable
- First-class Gitea support, the gap most Git tools leave wide open
GitPeak vs. the field
|
GitPeak |
GitLens |
Git Graph |
VS Code built-in |
| Real multi-lane commit graph |
✅ free |
Pro-gated on private repos |
✅ free |
Basic only |
| Visual conflict resolution |
✅ 3-pane + AI |
❌ |
❌ |
Text accept-current/incoming only |
| Interactive rebase GUI (drag, squash, reword) |
✅ |
List-based, Pro-gated |
Basic branch action only |
❌ |
| Smart Checkout (auto-stash/restore) |
✅ |
❌ |
❌ |
❌ |
| MCP server for AI agents |
✅ built in |
— |
❌ |
— |
| First-class Gitea support |
✅ |
Autolinks only |
Generic (CLI-based) |
Generic (CLI-based) |
| No telemetry by default, fully offline |
✅ |
Sends analytics/license calls |
✅ |
✅ (unless VS Code telemetry on) |
| Free tier ceiling |
Everything, always |
Graph/worktrees/AI need Pro on private repos |
Full feature set |
No conflict UI, no rebase |
Comparison based on public documentation as of mid-2026; vendors change pricing and feature gates often, so check their current docs.
Keyboard shortcuts
Press Ctrl+Alt+G (Cmd+Alt+G on macOS), let go, then press the second key:
| Keys |
Action |
Ctrl+Alt+G Space |
Show the GitPeak sidebar |
Ctrl+Alt+G G |
Open the commit graph (History Center) |
Ctrl+Alt+G P / L / F |
Push / Pull / Fetch |
Ctrl+Alt+G B |
Switch branch |
Ctrl+Alt+G S |
Stash changes |
Ctrl+Alt+G R |
Refresh |
If none of these work, another extension is probably using Ctrl+Alt+G by itself. GitPeak warns you when it finds one. Remove or rebind that shortcut in Keyboard Shortcuts (search ctrl+alt+g).
FAQ
How do I resolve merge conflicts in VS Code with GitPeak?
When a merge, rebase or cherry-pick stops on conflicts, open the Conflict Center from the GitPeak sidebar or the status bar. For each hunk, choose Accept main, Accept both or Accept incoming, or edit the Result pane by hand. Then click Resolve & Stage. GitPeak moves on to the next conflicted file.
Is GitPeak a free alternative to GitLens or Git Graph?
Yes. GitPeak is MIT-licensed, and every feature (commit graph, Conflict Center, interactive rebase, worktrees, AI with your own key) is free on public and private repositories. See the comparison table.
Does GitPeak work with Gitea, GitLab, Bitbucket and self-hosted Git?
Yes. Remote providers are auto-detected for GitHub, GitLab, Bitbucket and Gitea, including self-hosted instances. Any other Git remote works through the standard Git CLI.
Does GitPeak collect telemetry or send my code anywhere?
No telemetry by default. Anonymous usage metrics exist only as an opt-in setting and never include file contents, diffs, paths or keys. The AI features are off until you add your own provider, and you can point them at a local model (Ollama, LM Studio).
Does GitPeak work offline or in air-gapped environments?
Yes. Every Git feature runs locally against the Git CLI. Network calls happen only when you configure a provider token or an AI provider.
Does GitPeak work in Cursor, Windsurf or VSCodium?
Yes. Install it from Open VSX. On editors without VS Code's MCP API, register the MCP server manually (see For AI coding agents).
Which AI providers does GitPeak support?
Any OpenAI-compatible endpoint, Anthropic, Ollama, LM Studio and MiniMax. Keys are stored in VS Code's secret storage, never in settings files.
Can AI agents like Copilot or Claude Code use GitPeak?
Yes. GitPeak's built-in MCP server gives agents repo status, staged diffs, commit history, merge-risk prediction, line history and repo health as structured data.
Git that feels premium and gets out of your way.
Install GitPeak and make peace with your history.