Skip to content
| Marketplace
Sign in
Visual Studio Code>SCM Providers>Nifty Git: Git Client, Graph, Rebase & WorktreesNew to Visual Studio Code? Get it now.
Nifty Git: Git Client, Graph, Rebase & Worktrees

Nifty Git: Git Client, Graph, Rebase & Worktrees

Nifty

|
6 installs
| (0) | Free Trial
14-day free trial, then $39 once. A Git client in VS Code: commit graph, drag-and-drop merge and rebase, interactive rebase, undo, worktrees. No account.
Installation
Launch VS Code Quick Open (Ctrl+P), paste the following command, and press enter.
Copied to clipboard
More Info

Nifty Git

14-day free trial, then $39 once. A Git client inside VS Code: the commit graph, drag-and-drop merge and rebase, an interactive rebase editor, a conflict workflow, undo for what you do locally, stashes, worktrees and file history. No account and no cloud of ours: nothing leaves your machine except requests to your own git host when you ask for them.

Maintained. No sign-in. No telemetry. Works in VS Code, Cursor, Windsurf, VSCodium and other editors that use Open VSX.

Features

Opening the graph, dragging a branch onto the current one to merge it, then undoing the merge

The graph with branches, tags and a stash, the sidebar, and a commit's details with its files

  • The whole repository in one place. Every branch, remote branch, tag, stash and worktree in the sidebar, the commit graph in the middle, and a commit's message, author, signature and files on the right, as a list or as a folder tree. Click a file for its diff. Handles 100,000-commit histories: commits load as you scroll.
  • Drag and drop. Drop a branch onto another to merge or rebase, drop a commit onto your branch to cherry-pick it.
  • Interactive rebase, without the text editor. Reorder commits by dragging, and pick, reword, squash, fixup, edit or drop each one in a list. Reword, squash into parent and drop are also one right-click away.

The interactive rebase editor with one commit set to squash into the one before it

  • Conflicts, step by step. When a merge, rebase or cherry-pick stops, the conflicted files are listed with Open in merge editor (VS Code's three-way editor), take ours, take theirs and mark resolved, then Continue, Skip or Abort.
  • Undo what you do locally, and redo it. Every local operation records where the branches were and, for anything that touches uncommitted work, a snapshot of the working tree. Undo puts it all back, and refuses if a branch moved since. Deleted a branch? Hard reset? Dropped a stash? Undo. Changed your mind again? Redo. What has left your machine can't be taken back (a push, a branch or tag deleted on the remote), and the command preview says so before you run it.

A hard reset throws away the newest commit and an unsaved change; Undo brings both back

  • See the commands first. Before an operation that rewrites history, discards changes or changes a remote, Nifty Git shows the exact git commands it will run. Run them, copy them, or cancel. Turn it on for every operation if you want to learn git, or off if you don't.

The command preview before a rebase

  • Stashes and worktrees. Stash with a message, with or without untracked files, apply, pop, drop or turn a stash into a branch. Create worktrees from the sidebar and open them in a new window.
  • Branches done right. Ahead/behind counts, upstreams, gone branches, rename, delete with undo, compare any two branches or any two commits (commits on each side and the changed files), and file history with renames followed. Branches group into folders by their names (feature/…), and the ones you mark as favourites sit at the top.
  • Tidy branches. Pin branches to the left of the graph, show only what the current branch reaches, and clean up branches whose upstream is gone or that are merged into the default branch, with undo. Before a merge or a cherry-pick, a trial merge says whether it will conflict and in which files (git 2.38 or later).
  • More for stashes, tags and worktrees. Rename a stash without moving it in the list, sign annotated tags when you sign your commits, and lock, unlock and move worktrees.
  • A graph you can shape. Hide a branch from the graph or solo the ones you care about, choose which columns show and how wide they are, and switch to compact rows to see more history at once. A minimap beside the scrollbar shows where the branch tips, tags, HEAD and your search matches are.
  • Any repository, not just the workspace. Open a repository from anywhere on disk, clone one with progress and a Cancel button (the full history or only the latest commits), pick one of your own repositories on a host to clone without pasting a URL, or initialise a folder. Open repositories sit in tabs, recent ones stay one click away, and a set of tabs can be saved as a group that opens together.
  • New repositories, set up. Start a repository on the branch name you choose, with a README, a .gitignore from templates and a license. Star repositories and give them names of your own.
  • Git settings in one place. Line endings (core.autocrlf), the default branch for new repositories and your merge tool, under Tools. Open a conflicted file in your own merge tool.
  • Fetch in the background. Auto-fetch the open repository every few minutes, and fetch every repository in the workspace at once from the dashboard.
  • Commit from the panel. Stage, unstage and discard files, folders or everything, write the message, commit, amend, and skip the hooks when you must. Read a file's changes with whitespace ignored. Add a file or its folder to .gitignore from the file list. Signature status is shown on every commit.
  • Commit with care. Filter the changed files by path or status, in the list or the folder tree. Sign off commits, with the switch remembered per repository, or make an empty commit. The summary line shows its length and warns past 72 characters. Before a commit, Nifty Git warns about files over 50 MB and offers Git LFS, notes files whose only change is their line endings, and checks that your commit email is one of your account's on GitHub, GitLab, Gitea or Forgejo.
  • Hook output as it happens. What pre-commit, commit-msg and pre-push print shows in a small pane while they run.
  • Restore a file from any commit. From a commit's file list or a file's history, the file as it was goes into the working tree, and undo puts it back.
  • Stage hunks and lines. Open an uncommitted file's diff in the panel and stage, unstage or discard a hunk or the lines you select. Stash only the files you tick.
  • Image diffs. See the old and new version of a changed image side by side with their sizes, or compare them with swipe, onion skin or the changed pixels highlighted. For uncommitted changes, commits, comparisons, stashes and, when their branches are fetched, pull requests.
  • File encodings. Files are read in their own encoding: a byte order mark, working-tree-encoding in .gitattributes, or windows-1252 (or the fallback you set) when a file isn't UTF-8. Pick another encoding beside a file's diff, blame or history.
  • Blame. See who last changed each line of a file, at any commit, with the commit a click away. Inline blame shows it at the end of the current line in the editor.
  • Commit helpers. A Conventional Commits type and scope picker, co-authors from the repository's recent authors, and your commit template prefilled.
  • Lost commits, found. A reset too far, a dropped rebase, a deleted branch: the Lost commits section lists every commit the reflog still knows, ready to branch from or cherry-pick.
  • Bisect without the manual. Mark a good and a bad commit, test, click Good or Bad, and the first bad commit is found and shown in the graph.
  • Submodules, LFS, patches, remotes. Initialise, update, add and remove submodules and open one in its own graph; track patterns, pull files, and lock and unlock files with Git LFS; save commits or working changes as patch files and apply patches with git am or git apply; add, rename, re-point and remove remotes; check out tags, push them all, and delete a tag on the remote.
  • Sparse checkout. Pick the folders you want in a big repository and leave the rest out of the working tree. Turn it off again in a click.
  • Git Flow built in. Initialise it with your branch names and prefixes, start features, bugfixes, releases and hotfixes, and finish them: a release merges into main, gets its tag, merges back into develop and is deleted, every step shown first and undoable. No git-flow installation needed, and repositories set up with git-flow are recognised.

The Git Flow pane with a release in progress

  • Several commits at once. Ctrl-click or shift-click commits to cherry-pick, revert, squash into one or save them as a patch together. Cherry-pick can also apply the changes without committing.
  • Split a commit. Take a commit apart again: its changes come back unstaged, you commit them in pieces, and Continue replays the rest. Abort puts everything back.

Split commit: the changes of one commit come back unstaged and are committed again as two commits

  • Pull requests, start to finish. List open pull requests with their CI checks, read the description, comments and reviews, see the changed files with the comments on their lines, comment on a line or answer a thread, approve, request changes, merge with the method you choose, close, check one out, or create one for the current branch with reviewers, assignees, labels and your repository's template. Works with GitHub, GitLab, Bitbucket Cloud, Azure DevOps, Gitea and Forgejo, and with your company's own GitHub Enterprise, GitLab, Bitbucket Server or Gitea. GitHub uses VS Code's own sign-in; the others use an access token you paste once, kept in VS Code's secret storage. Requests go only to your repository's own host, and only when you open the list or press a button.
  • Pull requests, edited and checked. The new pull request form shows the commits and files it will hold. Edit a pull request after creating it: title, description, draft or ready, reviewers, assignees, labels and base branch. Re-run failed or all checks on GitHub Actions, GitLab, Azure DevOps and Bitbucket Pipelines.
  • Stacked pull requests. Start a branch on top of another and see the stack in the sidebar, with each branch's pull request, checks, review and whether it needs a restack. Create a pull request for every branch, each into the branch below. Restack after you amend or rebase a branch, as one step with undo that pauses on a conflict and carries on. Push the whole stack with --force-with-lease, and when the bottom pull request is merged, squash merges too, move the rest onto main in one step. On GitHub, GitLab, Bitbucket, Azure DevOps, Gitea and Forgejo. Which branch stacks on which is kept in the repository's git config, never in commits.
  • Protected branches and push protection. A banner warns before you commit or push on a branch the host protects, says what its rules require, and offers to create a branch. When GitHub refuses a push for a secret or a broken rule, a dialog says which one, in which file, line and commit, with the link to allow the secret.
  • Issues. Open issues from GitHub, GitLab, Gitea, Azure Boards, Jira or a Trello board in the sidebar, all of them or only yours. Read one with its comments, create one, comment, and move it (close, reopen, or your workflow's next state), and start work with "Create branch from issue", named after the issue and placed under your Git Flow feature prefix when you use one.
  • Your work across repositories. One pane lists the pull requests you opened, the ones waiting for your review and the issues assigned to you, for every repository open in the client.
  • Pin, snooze and get notified. Pin an item in your work across repositories to keep it on top, or snooze it until tomorrow, next week or a day you choose. Turn on nifty.git.notifications.enabled to hear when your review is asked for, when someone comments, approves or asks for changes, and when checks fail.
  • Several accounts per host. Add a second account on the same server, choose which one each repository uses, switch, or sign one out with Nifty Git: Host Accounts. Azure DevOps can use VS Code's own Microsoft sign-in instead of a token.

Pull requests with their checks and open issues in the sidebar, and a pull request's description, checks and conversation

  • Profiles. Save your identities once (Work, Personal, a client): name, email, signing key and the SSH key for the remote. Apply one to a repository in a click, and get a hint when a repository's remote matches a profile you haven't applied. Profiles live in your settings, so Settings Sync carries them.
  • Identity, signing and hooks. Set the name and email for this repository or globally, turn commit signing on with a GPG or SSH key, and enable or disable hooks with a click.
  • SSH and GPG keys. See the keys on this computer, generate a new SSH or GPG key, copy its public half or add it to your account on the host, all from the Keys tool. Pick the key under Signing or in a profile to sign commits with it.
  • Your account on the host. Create a repository on GitHub, GitLab, Bitbucket, Azure DevOps or Gitea for the one you have open and add it as the remote, or fork the remote's repository and add the fork.
  • Links to a commit. Copy a link to a commit or a branch; opening it on another machine shows that commit in Nifty Git there, or offers to clone the repository. A link names the repository by its remote, never by a path on your disk.
  • Keyboard and screen reader friendly. Everything in the panel works from the keyboard: Tab moves between the toolbar, the sidebar, the graph and the details, the arrow keys move inside lists, Shift+F10 or the Menu key opens the menu of the item you are on, and Escape closes menus and dialogs. Every drag and drop action is in the menus too. Commit, stage, stash, check out, branch, merge, rebase, compare, undo and redo are also VS Code commands you can bind to keys. Screen readers (NVDA, JAWS, VoiceOver, Narrator) hear each commit as its subject, author, date, hash and branches, and hear when an operation finishes or fails. High contrast themes and reduced motion are followed.
  • A guided start. A short walkthrough on VS Code's Welcome page shows the graph, the command preview, undo, committing and opening repositories.
  • In your language. The panel and its messages come in English, German, French, Spanish, Brazilian Portuguese, Japanese and Simplified Chinese. They follow VS Code's display language, or set nifty.git.language to choose one yourself, for example to keep git's own English vocabulary.
  • Repository health and a workspace dashboard. Object and pack sizes, the biggest files in the history, and one card per repository in the workspace with branch, ahead/behind, changes and the last commit.

The Repository health tool: object counts and the biggest files in the history

  • Credentials where you expect them. When a remote asks for a username and password, or an SSH key for its passphrase, the prompt appears as a VS Code input box. Your credential helper (Git Credential Manager, the macOS keychain) runs first as usual.
  • Careful with what a repository or a server hands it. A branch or tag named like a git option is refused instead of being passed to git. Text from git and from hosting services is always shown as plain text, never as a link that runs something. Hidden and direction-changing characters in names and paths are shown as markers, so two names that look alike can be told apart. Nifty Git runs only in folders you trust (VS Code's Workspace Trust). Access tokens are kept in VS Code's secret storage, one per account, and are not sent over plain http without asking first.
  • Private by design. No account, no telemetry, no AI, no cloud. Avatars from Gravatar are off unless you turn them on.

Open it with Ctrl+Alt+Shift+G (Cmd+Alt+Shift+G on Mac), the Nifty Git button in the status bar, or the branch icon in the Source Control view.

Buying

Nifty Git starts a 14-day trial the first time you open it, with every feature and no card. After that it needs a license key: $39 once per developer, with updates for a year and no expiry on the key (it works on up to 5 machines). Teams pay $19 per seat per year, and each developer on a seat gets their own key. Free for students and open-source maintainers on request. 30-day refunds. Buy at https://getnifty.dev/git, then run Nifty Git: Enter License Key. Nifty Git is commercial software: its license is in the LICENSE file that comes with it.

Commands

Command What it does
Nifty Git: Open Nifty Git Open the client (Ctrl+Alt+Shift+G)
Nifty Git: Fetch git fetch --all --prune --tags
Nifty Git: Pull… Pull with merge, rebase or fast-forward only
Nifty Git: Push Push the current branch (sets the upstream when there is none)
Nifty Git: Undo Last Git Operation Undo the last operation in this repository
Nifty Git: File History The history of the current file (also in the Explorer's right-click menu)
Nifty Git: Blame File / Toggle Inline Blame Who last changed each line of the current file; turn the end-of-line blame on or off
Nifty Git: Open Repository… / Clone Repository… / Initialise Repository… Open a repository outside the workspace, clone one, or run git init in a folder; it opens in the client and stays in its list of recent repositories
Nifty Git: Clone from Your Account… Pick one of your own repositories on your host from a list and clone it, without pasting its URL
Nifty Git: Open Repository Group… / Save Open Repositories as Group… Open every repository of a saved group as tabs in the client; save the repositories that are open now as a group
Nifty Git: My Pull Requests and Issues Open the client on your own open pull requests and the issues assigned to you, across the open repositories
Nifty Git: Copy Link to Current Commit Copy a link that opens the checked-out commit in Nifty Git on any computer that has the repository; it names the repository by its remote, never by a folder
Nifty Git: Commit Staged Changes… Commit what is staged (Ctrl+Alt+Shift+C)
Nifty Git: Stage All Changes / Unstage All Changes Stage or unstage everything
Nifty Git: Stash Changes… / Pop Latest Stash Stash your changes with a message; apply and drop the newest stash
Nifty Git: Check Out Branch… Pick a local or remote branch and check it out (Ctrl+Alt+Shift+B)
Nifty Git: Create Branch… Create a branch at the current commit, checked out or not
Nifty Git: Merge Branch into Current… Pick a branch and merge it into the current one
Nifty Git: Rebase Current Branch onto… Pick a branch and rebase the current one onto it
Nifty Git: Compare Two Branches… Pick two branches and see the commits on each side and the files that differ
Nifty Git: Redo Last Undone Git Operation Redo what the last undo took back
Nifty Git: Git Flow: Start… / Git Flow: Finish Current Branch Start a feature, bugfix, release or hotfix; finish the one that is checked out
Nifty Git: Apply Profile… Apply one of your identity profiles to this repository
Nifty Git: Host Accounts… Choose, add or sign out of an account on the repository's host
Nifty Git: Toggle Auto-Fetch Turn background fetching on (every 5 minutes) or off
Nifty Git: Enter License Key… / Remove License Key from This Machine Manage the license

Settings

Setting Default What it does
nifty.git.confirmCommands destructive When to show the git commands before an operation: always, destructive (rewrites history, discards changes or changes a remote) or never
nifty.git.pageSize 500 Commits loaded at a time
nifty.git.commitOrder topo topo keeps branches together; date or author-date sort by time
nifty.git.showRemoteBranches true Show origin/… branches in the graph
nifty.git.showTags true Show tags in the graph
nifty.git.showStash true Show stashes in the graph
nifty.git.dateFormat relative relative ("3 days ago") or absolute
nifty.git.avatars false Show Gravatar avatars (sends a hash of each author's email to gravatar.com)
nifty.git.showStatusBarItem true Show the Nifty Git button in the status bar
nifty.git.autoFetchMinutes 0 Fetch the repository open in Nifty Git in the background every this many minutes (git fetch --all --prune); 0 turns it off
nifty.git.inlineBlame false Show who last changed the current line, at the end of the line
nifty.git.conventionalCommits true Show the Conventional Commits helper above the commit message box
nifty.git.profiles [] Identity profiles; manage them under Tools, Identity and profiles
nifty.git.hosts {} Which service your own git servers run, by host name: github (GitHub Enterprise Server), gitlab, bitbucket-server or gitea, so pull requests and issues work for them. When the server's web address differs from the remote's host, give { "service": "gitlab", "url": "https://git.example.com:8443/gitlab" } instead. Set in your user settings only
nifty.git.issues.tracker auto Where the Issues section gets its issues: auto (Jira when a Jira site is set, otherwise the repository's host), host, jira, trello or off
nifty.git.jira.site Your Jira site, like https://example.atlassian.net
nifty.git.jira.email The email of your Jira Cloud account; leave it empty for Jira Data Center
nifty.git.jira.project The key of the Jira project whose issues to list, like SHOP; empty lists the issues assigned to you
nifty.git.trello.board The Trello board whose cards the Issues section lists: its address or its id
nifty.git.repositoryGroups [] Named sets of repositories that open together as tabs; save the open tabs as a group from the tab strip's + menu
nifty.git.largeFileWarning 50 Warn before committing files larger than this many MB, and offer Git LFS; 0 turns it off
nifty.git.encodingFallback windows-1252 The encoding used for a file that isn't valid UTF-8 and has no byte order mark
nifty.git.notifications.enabled false Notify about your pull requests: review requests, comments, approvals, requested changes and failed checks
nifty.git.notifications.intervalMinutes 10 How often pull requests are checked for notifications, at least 5 minutes
nifty.git.stackDescription true Put a line listing the stack in the description of each pull request Nifty Git creates for a stack
nifty.git.language auto The language of the panel and messages: auto follows VS Code's display language, or choose en, de, es, fr, ja, pt-br or zh-cn; takes effect after reloading the window

Git 2.25 or later must be installed and on your PATH.

Install

  • VS Code: search for "Nifty Git" in the Extensions view, or install from the Visual Studio Marketplace.
  • Cursor, Windsurf, VSCodium, Kiro, Antigravity: install from Open VSX.

Privacy

This extension collects no telemetry and needs no account. The only network calls are the license check against the license server when you enter a key (and once a week afterwards, with a 14-day offline grace period), requests to your repository's own hosting service, your Jira site or Trello when you open the pull request or issue lists or press a button there, Gravatar if you turn avatars on, and, when you turn notifications on, a check of your pull requests on your repositories' hosts every few minutes. Before you commit or push on a branch, Nifty Git asks the repository's host once per session whether the branch is protected, with your sign-in when you have one.

More Nifty tools

  • Nifty Git Graph: Git History & Branch Graph: See your git history as a graph: branches, merges and tags, commit details and diffs, and checkout, merge, rebase, cherry-pick and more from a right-click. No sign-in. (Open VSX)
  • Nifty Branches: Clean Up Merged Git Branches: Safely clean up merged, squash-merged, gone and stale git branches, with a preview and one-click restore. (Open VSX)
  • Nifty Changelists: JetBrains-Style Git Changelists: Group uncommitted files into named changelists and commit each one separately, like JetBrains IDEs, and reword old commit messages without an interactive rebase. (Open VSX)
  • Nifty Git Links: Open in GitHub, GitLab & Bitbucket: Open or copy links to files, lines, commits and pull requests on GitHub, GitLab, Bitbucket, Azure DevOps and Gitea. (Open VSX)
  • Nifty Git Pack: 6 Nifty extensions for working with Git: Branches, Git Graph, Git Links, Changelists, AI Review, Pre-commit. (Open VSX)
  • Nifty Pre-commit: Git Hooks with Your venv: Make pre-commit and other git hooks use your Python virtual environment when you commit from the Source Control view, plus run and install pre-commit. (Open VSX)

See all 100+ Nifty extensions and web tools at https://getnifty.dev

  • Contact us
  • Jobs
  • Privacy
  • Manage cookies
  • Terms of use
  • Trademarks
  • Your Privacy Choices
  • Consumer Health Privacy
© 2026 Microsoft