GitForge

Advanced Git tools for VS Code - inspired by JetBrains IDEs

Features

🔍 Inline Git Blame

Click on any line to instantly see who made the change and when. Navigate through the complete history of any line with ease.

• One-click blame - Click any line number to see blame info
• Deep history - Navigate back through 100+ commits
• Hover details - Rich commit information on hover
• Relative dates - "2 days ago" instead of timestamps

⚔️ Conflict Resolver

A beautiful, three-way merge UI for resolving merge conflicts - no more manual editing of conflict markers.

• Three-panel view - Current Branch | Result | Incoming Branch
• Line-by-line selection - Click arrows (← →) to choose individual changes
• Magic wand merge - 🪄 Smart merge that combines both versions intelligently
• Accept All buttons - Accept all local or all remote with one click
• Multi-file support - Handle multiple conflicted files with progress tracking
• Branch indicators - See exactly which branches you're merging
• Manual editing - Edit the result directly when needed

🔀 Branch Management

Full-featured branch panel like WebStorm/IntelliJ.

• View all branches - Local and remote branches in one place
• Create branches - With optional checkout
• Rename branches - Quick rename from context menu
• Delete branches - With force delete option
• Merge branches - Direct merge with conflict detection
• Push to remote - Push branches with upstream tracking
• Fetch updates - Fetch from remote with one click
• Search/filter - Find branches quickly
• Ahead/behind indicators - See commit differences at a glance

↩️ Rollback Changes

Selectively rollback changes with a beautiful UI.

• All file states - Shows staged, unstaged, and untracked files
• Type filters - Filter by Modified, Added, or Deleted
• Search - Find files by name
• Diff preview - Double-click to view changes
• Batch rollback - Select multiple files to rollback at once
• Single file rollback - Rollback individual files with one click

📋 Merge Changes Panel

See all changes at a glance during merge operations.

• File tree view - All changed files organized by folder
• Change summary - Additions, deletions, modifications
• Quick navigation - Click to open any changed file
• Status indicators - See staged, unstaged, and conflicted files

Installation

From VS Code Marketplace

1. Open VS Code
2. Go to Extensions (Ctrl+Shift+X / Cmd+Shift+X)
3. Search for "GitForge"
4. Click Install

From VSIX

code --install-extension gitforge-1.0.0.vsix

Usage

Toggle Blame

• Command Palette: GitForge: Toggle Line Blame
• Keyboard: Ctrl+Shift+B / Cmd+Shift+B
• Click: Click on line number in gutter

Show Line History

• Right-click on any line → GitForge: Show Line History
• Or use Command Palette: GitForge: Show Line History

Conflict Resolver

When conflicts are detected, GitForge automatically shows the Conflict Resolver panel. You can also:

• Command Palette: GitForge: Open Conflict Resolver
• Activity Bar: Click the GitForge icon → Conflicts panel

Merge Panel

• Activity Bar: Click the GitForge icon → Merge Changes panel
• Command Palette: GitForge: Show Merge Changes Panel

Branch Panel

Manage branches like in WebStorm/IntelliJ:

• Command Palette: GitForge: Branches...
• Right-click menu: Git → Branches...

In the panel you can:

• Double-click a branch to checkout
• Click merge button (🔀) to merge into current branch
• Click rename button (✏️) to rename
• Click delete button (🗑️) to delete
• Click push button (⬆️) to push to remote

Rollback Panel

Rollback unwanted changes:

• Command Palette: GitForge: Rollback Changes...
• Right-click menu: Git → Rollback Changes...
• Single file: GitForge: Rollback This File

Configuration

Keyboard Shortcuts

Requirements

• VS Code 1.85.0 or higher
• Git installed and available in PATH
• A Git repository open in workspace

Contributing

Contributions are welcome! Please read our Contributing Guide for details.

License

MIT © John Yaghobieh

Made with ❤️ by John Yaghobieh