Git Brain 🧠

The missing synapse in your version control workflow.

Git Brain is a VS Code and Cursor extension that makes everyday Git work clearer, safer, and faster. Instead of juggling terminal commands and scattered UI panels, you get one cohesive workflow for commits, branches, history, stash operations, blame, and merge conflict resolution.

The goal is simple: keep you focused on code, not Git plumbing. Less yak-shaving, more shipping. 🚀

JetBrains-style Git capabilities, rebuilt for VS Code, Cursor and more:

Git graph and commit history exploration in one place
Integrated diff workflows and commit details navigation
Dedicated 3-way merge conflict resolution UI
Branch, stash, and sync operations without terminal-heavy context switching

Why Git Brain ✨

Modern editor workflows are fast, AI-assisted, and context-rich, but Git often still feels fragmented. Git Brain treats Git as a first-class in-editor experience:

Fewer context switches between terminal, source control, and log tooling 🧭
Safer branch and pull operations when your worktree is dirty 🛟
Better conflict resolution with a true 3-way merge UI 🛡️
Faster understanding of history through graph, filters, and blame-to-log navigation 🔎

Core Workflows ⚡

1) Daily commit flow ✅

Review changes in grouped sections (CHANGES, UNTRACKED, CONFLICTS)
Select files to include, write a commit message, and commit or commit-and-push
Reuse previous messages from local commit message history
Run Git hooks before commit using the commit options toggle

2) Smart pull and branch switching 🔄

Use Smart Pull (merge or rebase mode) without manually preparing stash commands
Use Smart Checkout to switch branches safely with automatic stash/restore handling
Get guided recovery when operations hit conflicts

3) Conflict resolution that feels designed 🧩

Open a dedicated Local/Result/Remote 3-way merge editor
Navigate conflicts quickly, apply left/right/both resolutions, and edit result content directly
Use non-conflicting and simple-conflict helper actions, then finish with Complete Merge or Complete Merge and Push

4) History and root-cause analysis 🌳

Explore an interactive commit graph with infinite scroll
Filter by search text, author, date ranges, and include-all-refs mode
Open commit details and file-level diffs
Jump from inline blame hover directly to the related commit in the log

5) Branch and stash operations from one UI 🌿

Open a metadata-rich branch picker with local/remote actions
Compare branches at file level, merge or rebase, fetch, pull, and push
Create, apply, pop, drop, and clear stashes, including stash file diff previews

Feature Breakdown 🛠️

Activity and Commit Experience 🧠

Activity view mirrors working tree state with dedicated grouped sections and counts
File and section context menus include commit, stash, discard, delete untracked, add to .gitignore, diff, reveal in explorer, and jump to source
Commit tab supports file selection, commit, commit-and-push, and recent message history
Commit toolbar includes a report-bug shortcut that opens a prefilled report page
Push tab shows unpushed commits and files with diff shortcuts

Log and Commit Details 📜

Multi-lane commit graph with pagination/infinite scroll
Commit details view with metadata and per-file diff access
Cherry-pick and revert actions directly from log context menus
Include-all-refs setting to broaden or narrow history scope

Branch Management and Remote Workflows 🌐

Branch picker includes local and remote branches with current-branch highlighting
Local actions: checkout, create from selection, merge into current, rebase current onto selection, rename, delete
Remote actions: checkout/create local, compare vs current or working tree, merge/rebase/pull, delete remote
Update Project supports merge or rebase strategy
Push rejection guidance offers pull-and-push recovery

Stash Operations 📦

Create stash with message (including selected-file stash from commit/activity actions)
Apply, pop, drop, clear, and browse stash entries
Expand stash items to inspect stashed files and open diffs
Conflict-aware feedback when stash operations introduce conflicts

Merge Conflict Tooling 🧯

Dedicated 3-way merge editor with Local/Result/Remote panes
Conflict navigation, accept-left/right/all, accept-both, and undo/redo support
Synced scrolling, conflict markers, and language-aware syntax highlighting
Merge-in-progress alert in Activity view with resolve and abort actions

Inline blame annotations with age-based heatmap style
Hover cards include hash, author, date, subject/body details
One-click "Show in Git Log" navigation from blame context

Workspace Awareness 🗂️

Multi-root workspace support with project switching inside the Git Brain views
Auto-refresh for key Git changes (branch/ref/save events)
Configurable background auto-fetch behavior

Keyboard Shortcuts ⌨️

Git Brain commands and shortcuts are managed through VS Code settings:

Open Command Palette
Run Preferences: Open Keyboard Shortcuts
Search for Git Brain commands
Add or customize keybindings to match your workflow

Install 📦

Learn more on the Git Brain website.

Getting Started 🚀

After installing, a fast path to value:

Open Git Brain Activity view and review your changed files
Open diffs and prepare a commit from the Commit tab
Use branch picker for checkout/compare/merge/rebase actions
If conflicts appear, open the 3-way merge editor from the CONFLICTS section
Use Git Log to inspect history and commit details
Enable inline blame when you need quick line-level context

Git Brain includes anonymous analytics to help improve product quality, and it never sends code, file paths, file contents, diffs, commit messages, raw branch names, or raw remote URLs.

Community and Support 🤝

Found a bug or want to request a feature? We would love to hear from you.

Report an issue
In the Commit tab, use the built-in report-bug shortcut for prefilled context 🐞

Master your repository. Free your brain. 🎉

Git Brain

git-brain