Manta's Git Grace

Anantachai Saothong

|
577 installs
|
1,885 downloads
| (1) | Free
Add persistent Git commands.
Installation
Launch VS Code Quick Open (Ctrl+P), paste the following command, and press enter.
Copied to clipboard
More Info

Git Grace is a Visual Studio Code extension that provides handy and persistent Git commands.

Introductory

The problems with Visual Studio Code built-in Git commands are:

  1. Error messages are hidden in the Git output channel.
  2. Progress bar is hidden in the SCM panel.
  3. Retrying fetch and pull should have been done automatically.
  4. Commands are executed asynchronously. You have to wait until the current command has been done before calling another command.

For example, if you fails running fetch for whatever reasons, it does not show any error feedback, unless you open its Git output channel manually. And it should retry the operation automatically for user's convenience since it is safe to do so.

Here are the solutions to the problems above:

  1. Error messages are shown in the notification area with Show Log button to open Git Grace output channel (do not confuse this with the built-in Git output channel.)
  2. Progress is shown at the status bar or as a notification.
  3. Retrying fetch and pull will be done twice.
  4. Queuing system ensures commands will be executed in sequence. You can call another command without waiting for the current command to be finished.

Basic usage

As soon as Git Grace is installed, the extension provides the following keybindings and commands:

Keybinding Command Description
alt+g f gitGrace.fetch Fetch from origin with --prune. You will be asked if you want to fast forward/push/rebase/merge when the current local branch and its remote counterpart are out of sync.
alt+g u gitGrace.pull Fetch from origin with --prune then rebase normally.
alt+g p gitGrace.push Push to origin with --tags. You will be asked if --force-with-lease is needed when the current local branch and its remote counterpart are out of sync.
alt+g d git.openChange Open the diff window for the active file.
alt+g y gitGrace.stageAll Add files to the stage.
alt+g z gitGrace.unstageAll Remove added files from the stage.
alt+g r gitGrace.cleanAll Revert dirty files.
alt+g c gitGrace.commitSmart Open Visual Studio Code built-in Git source control panel and prompt last 500 commit messages that were written by the current user.
alt+g a gitGrace.commitAmend Similar to git.undoCommit but prompt a confirmation dialog beforehand.
alt+g e gitGrace.commitEmpty Commit with --allow-empty and the message of "(empty commit)".
alt+g q gitGrace.squash Modify the selected commit in the current path with the current staged files. There is a chance of conflicts; use at your own risk.
alt+g n gitGrace.branch Create a new branch at the current commit, or rename the current non-master local branch. You will be asked to type a branch name.
alt+g s gitGrace.checkout Checkout an existing branch while fetching the remote branches in the background. You will be asked if you want to stash/discard the dirty files and discard the dangling commits beforehand.
alt+g m gitGrace.master Checkout the commit at origin/master without creating a branch (detached head). You will be asked if you want to stash/discard the dirty files and discard the dangling commits beforehand.
alt+g h gitGrace.openWeb Open the link to the active file in your web browser.
alt+g j gitGrace.pullRequest Push and open the link to GitHub pull-request creation page in your web browser, which is something like _http://github.com/user/repository/compare/master...branch_.|
alt+g g gitGrace.sync Push to origin then pull with --all, --rebase and finally pushes everything to origin. You will be asked to commit beforehand if the repository is dirty.
alt+g o gitGrace.showOutput Open the output channel for Git Grace extension.
gitGrace.urgent Commit all files with the message of "(work-in-progress)", create WIP tag, and push only the tag. This command is useful when you want to leave your computer and continue where you left off on another computer.
gitGrace.urgentRestore Checkout and delete WIP tag that corresponding to the current local branch.
alt+g l tortoiseGit.showLog Show the log messages for the whole repository.
alt+g k tortoiseGit.showFileLog Show the log messages for the current active file.
alt+g v tortoiseGit.commit Commit with TortoiseGit.
alt+g b tortoiseGit.blame Open TortoiseGitBlame for the current active file.
alt+s s gitGrace.stash Save an unnamed stash with --include-untracked.
alt+s p gitGrace.stashPopLatest Restore the last stash without hassle.
alt+s l gitGrace.stashPop Open the stash list and restore the selected stash.
alt+s c gitGrace.stashClear Clear the stash list.
alt+s x gitGrace.deleteBranch Similar to git.deleteBranch.
gitGrace.deleteMergedBranches Delete all the branches that have been merged to origin/master. This command is available in the command palette as Delete Merged Branches.

TortoiseGit integration (Windows exclusive) is slightly modified from Marko Binic's TortoiseGit Commands extension. By default, the path to TortoiseGit executable is C:\Program Files\TortoiseGit\bin\TortoiseGitProc.exe, but it can be changed later at gitGrace.tortoiseGitPath setting.