Skip to content

aotemj/jetbrains-git-graph

 
 

Repository files navigation

JetBrains Git - IntelliJ IDEA Git Graph, Commit & Shelf for VS Code

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, and 3-way merge editor. Works like WebStorm, PyCharm, GoLand, and Rider's Git tooling.

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

English · 简体中文


Features

Branch Context Menu

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

Branch Checkout

Commit Context Menu

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

Commit Context Menu

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

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

3-Way Merge Editor

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

Conflict Management

Conflict List

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

All Context Menu Actions

Branch (right-click)
  • Checkout
  • New Branch from...
  • Checkout and Rebase onto current
  • Rebase current onto branch
  • Merge into current
  • Rename (local only)
  • Delete (with force-delete fallback)
  • Update (pull)
  • Push
Commit (right-click)
  • Copy Revision Number
  • Cherry-Pick
  • Checkout Revision
  • Reset Current Branch to Here (Mixed/Soft/Hard)
  • Revert Commit
  • New Branch...
  • New Tag...
Changed Files (right-click)
  • Show Diff
  • Edit Source
  • Open Repository Version
  • Revert Selected Changes
  • Cherry-Pick Selected Changes
  • Copy Path
  • Copy File Name

Installation

From Marketplace:

Search for "IDEA-Like Git" 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/aotemj/jetbrains-git-graph.git
cd jetbrains-git-graph
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

License

MIT

About

JetBrains-style Git visualization for VS Code

Resources

License

Stars

7 stars

Watchers

0 watching

Forks

Releases

No releases published

Packages

 
 
 

Contributors

Languages

  • TypeScript 94.1%
  • CSS 5.7%
  • Other 0.2%