JetBrains Git Control

The most complete IntelliJ IDEA / JetBrains Git experience for VS Code and Cursor. Includes Git graph visualization, IDEA-style commit panel with shelf and stash, branch management with context menus, cherry-pick, rebase, merge, 3-way merge editor, and WebStorm-style Annotate with Git Blame inline annotations. Works like WebStorm, PyCharm, GoLand, and Rider's Git tooling.

Note: This project is a fork of JetBrains Git - IntelliJ IDEA Git Graph, Commit & Shelf for VS Code, extended with inline git blame annotations and commit-graph navigation.

Fork of zhyc9de/jet-git with full IntelliJ IDEA-style context menus and UI enhancements.

English · 简体中文

Features

Inline Git Blame Annotations

WebStorm-style inline blame annotations for every line, with click-to-jump to the Git Log commit graph.

• Display modes: whole file / cursor line only / N lines around cursor
• Configurable columns: revision, date, author, commitNumber (select what you need)
• Name styles: initials, last name, first name, full name, email
• Age-based coloring: gradient colors based on commit age (new→blue, mid→green, old→gray)
• Left alignment: all lines right-aligned, even without blame annotations

Branch Context Menu

Right-click any branch to checkout, create, merge, rebase, rename, delete, push, or pull — just like IntelliJ IDEA.

Commit Context Menu

Right-click any commit to copy hash, cherry-pick, checkout revision, reset, revert, create branch or tag.

Changed Files Context Menu

Right-click files in the Changed Files panel: show diff, edit source, open repository version, revert/cherry-pick file changes, copy path.

Git Graph

• Branch Tree — branches organized by Local / Remote / Tags with search filter
• Commit List — color-coded branch lines, resizable columns (Message, Author, Date, Hash)
• Detail Panel — commit message and changed file tree
• Filters — filter by Branch, User, Date range

3-Way Merge Editor

• Three-column layout: Theirs | Result | Yours
• Conflict highlighting with per-block action buttons
• Full syntax highlighting

Conflict Management

• Quick actions: Accept Yours / Accept Theirs / Merge
• Integration with VS Code Source Control panel

Git Worktree

JetBrains-style worktree management panel in the Activity Bar sidebar.

• Worktree list — view all worktrees with branch and path columns
• New Worktree — searchable dropdown for branches (local + origin/*) and tags, with input validation and auto-fill
• Open Project — double-click to open with native VS Code dialog (This Window / New Window)
• Prune — clean up stale worktree metadata with JetBrains clearCash icon
• Sidebar collapse — toggle toolbar visibility
• Settings — jgc.worktree.openBehavior: ask (default) / thisWindow / newWindow

All Context Menu Actions

Configuration

Configure in VS Code Settings under JGC:

Installation

From Marketplace:

Search for "JetBrains Git Control" or "JGC" in VS Code Extensions.

From .vsix:

1. Download the latest .vsix from releases
2. Cmd+Shift+P → "Extensions: Install from VSIX..."

Requirements

• VS Code 1.85.0+
• Git installed and in PATH

Local Development

git clone https://github.com/witt-bit/jetbrains-version-control.git
cd jetbrains-version-control
pnpm install
cd webview && pnpm install && cd ..

Press F5 to launch Extension Development Host.

pnpm run watch          # Watch mode
pnpm run build          # Production build
pnpm run vsce:package   # Package as .vsix

Credits

• Original: aotemj/jetbrains-git-graph
• Fork from: zhyc9de/jet-git
• Icons: IntelliJ IDEA Icons (Apache 2.0)

License

MIT