GitRig

A toolkit that makes day-to-day git work easier — changelists, shelves, branch management and a merge tool, all integrated into the VS Code SCM panel.

Installation

No compilation needed. Download the latest .vsix file from this repository and install it directly:

1. Open VS Code
2. Go to the Extensions panel (Ctrl+Shift+X)
3. Click the ··· menu → Install from VSIX...
4. Select the downloaded .vsix file

Features

Changelists

Organize your modified files into named groups without staging them. Files added to a changelist are hidden from git's staging area via git update-index --assume-unchanged.

• Create, rename, and delete changelists
• Add files via right-click in the SCM Changes panel
• Remove files or stage them directly from the Changelists panel
• Stage all files in a changelist at once
• Multi-root workspace support

Shelves

Save your current changes to a named shelf and restore them later. Shelved files are automatically reverted from the working tree.

• Create a shelf from selected modified files
• Add individual files to an existing shelf via right-click
• Apply a full shelf or a single file from it
• Delete shelves you no longer need

Right-click any modified file in the SCM Changes panel to access both features:

Branch Management

A full branch management panel in the SCM sidebar with support for local and remote branches.

• Checkout, rename and delete branches
• Create a new branch from any existing one
• Merge a branch into the current one (with auto-stash if working tree is dirty)
• Rebase current branch onto another (with --autostash)
• Checkout and rebase onto current
• Pull current branch or fast-forward update a local branch from its remote

Merge Tool

A 3-panel merge editor that shows the local version, the result (editable), and the incoming version side by side with synchronized scrolling.

• Accept the left or right side per hunk
• Edit the result column manually
• Abort the merge at any time
• After resolving all conflicts and saving, automatically runs git add and git commit to finalize the merge

When a merge conflict is detected, GitRig shows a notification with a shortcut to open the tool:

The merge tool can also be opened from the Command Palette:

Requirements

• VS Code 1.75+
• A git repository in the workspace