IntelliGit - Jetbrains Git for VS Code

IntelliGit brings a JetBrains-style Git workflow into VS Code, so you can stage, commit, inspect history, and manage branches without bouncing between multiple tools.

中文说明: 本项目已添加中文语言支持！如果您想查看中文版本，请查看 README_zh-CN.md。

About This Project

This project is a fork from the open-source project IntelliGit on GitHub, developed based on the JetBrains IDE-style Git interface design philosophy.

Major Changes in This Version

• ✅ Added Simplified Chinese (zh-CN) language support
• ✅ All UI interface elements have been internationalized
• ✅ Added localization files package.nls.json and package.nls.zh-cn.json
• ✅ Added WebView i18n utility module

Development Tools: This modification was developed using Trae SOLO mode with the MiniMax-M2.5 model.

Documentation

Localization Files

How Users Benefit

• Move faster on daily Git work with one focused UI for commit, history, and branch actions.
• Reduce context switching by keeping staging, diffs, commit graph, and commit details in IntelliGit panels.
• Handle risky Git operations with guardrails (confirmations and action availability rules for pushed/merge commits).
• Get familiar behavior if you are coming from IntelliJ/PyCharm Git tooling.

Core Workflows

1) Commit and Shelf Workflow (Sidebar)

• Commit tab with file tree, selective staging checkboxes (section/folder/file), diff open on click, and commit message area
• Toolbar actions: Refresh, Rollback, Group by Directory, Shelve, Show Diff Preview, Expand All, Collapse All
• Commit, Commit and Push, and Amend support
• Shelf tab for stash-based "shelf" workflow: save full or partial changes, then Apply, Pop, or Delete

Why this helps:

• You can build clean commits quickly, even in large change sets.
• You can park unfinished work safely and come back later without losing flow.

2) Commit Graph and History (Bottom Panel)

• Three-pane layout: branch column, commit list/graph, and commit detail pane
• Canvas-based lane graph with infinite scroll pagination for large histories
• Text/hash search and branch filter
• Selected commit shows changed files, file stats, and commit metadata

Why this helps:

• You can understand branch history and merge paths faster.
• You can inspect any commit without leaving the graph context.

3) Branch Management (From Branch Column Context Menu)

Available actions:

Why this helps:

• Most branch operations are available directly where you browse history.
• Less command-line overhead for common branch maintenance tasks.

4) Commit Context Actions (From Commit Row Context Menu)

• Copy Revision Number
• Create Patch
• Cherry-Pick
• Checkout Revision
• Reset Current Branch to Here
• Revert Commit
• Undo Commit (unpushed, non-merge)
• Edit Commit Message (unpushed, non-merge)
• Drop Commit (unpushed, non-merge)
• Interactively Rebase from Here (unpushed, non-merge)
• New Branch
• New Tag

Why this helps:

• Advanced history editing is available in-place, with safer availability rules.

5) Workspace Change Badge

• Activity bar badge shows current changed-file count in the workspace

Why this helps:

• You always know if your working tree is clean before pushing or switching context.

Quick Start

1. Open a Git repository in VS Code.
2. Open IntelliGit from the activity bar.
3. Use the Commit tab to stage files, write a message, and commit.
4. Open the bottom IntelliGit panel to inspect graph history, filter by branch, and review commit details.
5. Use branch or commit context menus for advanced operations.

JetBrains Merge Tool Setup (Optional)

IntelliGit can open merge conflicts in a JetBrains IDE merge tool (PyCharm, IntelliJ IDEA, WebStorm, etc.).

1. Open VS Code Settings and search for IntelliGit: JetBrains Merge Tool Path.
2. Set intelligit.jetbrainsMergeTool.path to your JetBrains app path.
3. On macOS, you can paste the .app path directly (IntelliGit auto-resolves the internal executable).
4. Keep intelligit.jetbrainsMergeTool.preferExternal enabled (default) if you want IntelliGit to use JetBrains first.

Examples (macOS):

• /Applications/PyCharm.app
• /Applications/IntelliJ IDEA.app
• /Applications/WebStorm.app
• /Users/<your-user>/Applications/PyCharm.app

Examples (Windows):

• C:\\Program Files\\JetBrains\\PyCharm 2025.1\\bin\\pycharm64.exe
• C:\\Program Files\\JetBrains\\IntelliJ IDEA 2025.1\\bin\\idea64.exe
• C:\\Program Files\\JetBrains\\WebStorm 2025.1\\bin\\webstorm64.exe

Helpful command:

• Run IntelliGit: Detect JetBrains Merge Tool from the Command Palette to auto-detect installed JetBrains IDEs and save the path.

If no JetBrains IDE path is configured, IntelliGit falls back to the VS Code internal merge editor.

Requirements

• VS Code 1.96.0 or later
• Git installed and available on PATH

Installation

From Marketplace

Search for IntelliGit in VS Code Extensions, or install from:

• VS Code Marketplace
• Open VSX Registry

Development

# Install dependencies
bun install

# Build (development)
bun run build

# Watch mode
bun run watch

# Run linter
bun run lint

# Type check
bun run typecheck

# Run tests
bun run test

# Format code
bun run format

Manually test the changes

bun install
bun run build
bun run package
code --install-extension intelligit-*.vsix

Running the Test Suite

# Run all unit and integration tests
bun run test

# Run tests in watch mode (re-runs on file changes)
bun run test -- --watch

# Run a specific test file
bun run test -- tests/unit/gitops.test.ts

# Run tests matching a pattern
bun run test -- -t "CommitPanelApp"

Architecture (High Level)

GitExecutor (simple-git wrapper)
    |
GitOps (operations layer)
    |
View Providers (extension host orchestration)
    |
Webviews (React apps for commit panel + commit graph panel)

Data flow highlights:

1. Commit selection in graph requests commit details from extension host and updates detail pane.
2. Branch selection filters the graph and clears stale commit detail state.
3. Commit panel file count updates the activity badge.
4. Refresh reloads branch state, history, and commit panel data together.

Tech Stack

License

MIT