#rebase
JetBrains Git - IntelliJ IDEA Git Graph, Commit & Shelf for VS Code
autemj
Bring IntelliJ IDEA / JetBrains Git experience to VS Code & Cursor: Git graph visualization, IDEA-style commit panel with shelf/stash, branch management, cherry-pick, rebase, merge, 3-way merge editor, and context menus. The best JetBrains Git alternative for Visual Studio Code.
Merge Studio — 3-Way Merge & Conflict Resolver
gitstudio
A beautiful 3-way merge conflict editor for VS Code & Cursor: resolve conflicts with color ribbons and one-click accept arrows, a conflicts dashboard, undo history, and a precise side-by-side diff — with optional one-click hand-off to an installed JetBrains IDE.
GitNav: Visual Git History & Workflows
tuna-ex
Explore visual Git history, compare branches and code, and run guarded Git workflows directly in Visual Studio Code.
IntelliG
KaHoChan
IntelliJ IDEA-style Git workflows for VS Code
GitWand
Gitwand
Git's magic wand — automatic conflict resolution for VS Code
I-Rebase
13hakta
Interactive git rebase editor
Git Peak — Visual Source Control & Commit Graph
NotifyX
Git visual workspace for VS Code — a real commit graph, one-click conflict resolution, and safe everyday Git version control. Works with GitHub, GitLab, Bitbucket, and self-hosted Gitea. No telemetry, fully offline-capable.
Git Simple Compare
newdlops
Compare git branches, review editable diffs, resolve conflicts, and create AI commit plans and messages.
Merge Magic — AI Conflict Resolver
laksh-mishra
Auto-resolves merge conflicts and surfaces real intent decisions for human review. Works in VS Code AND as a standalone git merge driver (any terminal). Multi-backend (Copilot, Claude, GPT, Gemini, Ollama). Never auto-commits.
Rebase Buddy
frontmatters
Interactive rebase editor with commit details — free and minimal
GitActions
Donkisoft
Run Git actions from the right-click menu: diff, log, history, blame, stash, merge, rebase, branches, remotes and more.
Gops - Visual Git Toolkit
codemanxdev
Visual Git Toolkit for VS Code