Manta's Git Grace

Git Grace, unlike any other Git companions, provides persistence and safety checks on Git operations, for example,

Operations are queued so you can call another command without waiting for the current command to be finished.
Progress is shown at the status bar or as notifications so you know what is going on.
Prompts are added before running destructive commands such as checking out another branch while having a dangling commit on the current branch.

Basic usage

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

Command/ Keybinding	Description
`gitGrace.fetch` (Alt+G F)	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.
`gitGrace.checkout` (Alt+G S)	Checkout an existing branch while fetching the remote branches in the background, and create the local counterpart branch. You will be asked if you want to stash/discard the dirty files and discard the dangling commits beforehand.
`gitGrace.branch` (Alt+G N)	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.
`gitGrace.master` (Alt+G M)	Checkout the commit at origin/HEAD 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.
`gitGrace.pull` (ALT+G U)	Fetch from origin with --prune then rebase normally.
`gitGrace.push` (Alt+G P)	Push to origin. You will be asked if --force-with-lease is needed when the current local branch and its remote counterpart are out of sync.
`gitGrace.commitSmart` (Alt+G C)	Prompt for a commit message with last 500 historical messages suggested and create a commit using Visual Studio Code built-in Git source control panel.
`gitGrace.commitAmend` (Alt+G A)	Similar to `git.undoCommit` but prompt a confirmation dialog beforehand.
`gitGrace.commitEmpty` (Alt+G E)	Commit with --allow-empty and the message of "(empty commit)".
`gitGrace.stageAll` (Alt+G Y)	Add files to the stage.
`gitGrace.unstageAll` (Alt+G Z)	Remove added files from the stage.
`gitGrace.cleanAll` (Alt+G R)	Revert dirty files.
`gitGrace.deleteBranch` (Alt+G X)	Similar to `git.deleteBranch`.
`gitGrace.deleteMergedBranches`	Delete all the branches that have been merged to origin/HEAD. This command is available in the command palette as Delete Merged Branches.
`gitGrace.squash` (Alt+G Q)	Modify the selected commit in the current path with the current staged files. There is a chance of conflicts; use at your own risk.
`gitGrace.sync` (Alt+G G)	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.
`gitGrace.pullRequest` (Alt+G J)	Push and open GitHub pull-request creation page.
`gitGrace.openWeb` (Alt+G H)	Open the current active file in GitHub.
`gitGrace.blame` (Alt+G B)	Open the current active file in GitHub blame page.
`gitGrace.showOutput` (Alt+G O)	Open the output channel for Git Grace extension.
`gitGrace.stash` (Alt+S S)	Save an unnamed stash with --include-untracked.
`gitGrace.stashPopLatest` (Alt+S P)	Restore the last stash without hassle.
`gitGrace.stashPop` (Alt+S L)	Open the stash list and restore the selected stash.
`gitGrace.stashClear` (Alt+S C)	Clear the stash list.
`git.openChange` (Alt+G D)	Open the diff window for the active file.

Fork integration

In order to enable Fork integration, Fork CLI must be installed under Settings > Integration.

Command	Description
`fork.showLog`	Show history for the current repository.
`fork.showFileLog`	Show history for the current active file.
`fork.commit`	Open Fork commit dialog for the current repository.

TortoiseGit integration

Modified from Marko Binic's TortoiseGit Commands, TortoiseGit integration will search for TortoiseGitProc.exe automatically.

Command	Description
`tortoiseGit.showLog`	Show history for the current repository.
`tortoiseGit.showFileLog`	Show history for the current active file.
`tortoiseGit.commit`	Open TortoiseGit commit dialog for the current repository.
`tortoiseGit.blame`	Open TortoiseGit blame dialog for the current active file.

Anantachai Saothong

Basic usage

Fork integration

TortoiseGit integration