// Git Toolbox

Git alias generator

Pick the shortcuts you want (or create yours) and paste the result in your Git config.

Every day

git stgit status -sbShort status with the current branch.
git swgit switchChange branch: git sw main.
git brgit branchList or create branches.
git cigit commitgit ci -m "message".
git cmgit commit -mgit cm "message" straight away.
git aagit add --allStage everything (new, modified, deleted).
git syncgit pull --rebase --autostashGet the latest changes without merge commits, even with local changes.
git pushf Cautiongit push --force-with-leaseForce push that refuses to overwrite someone else's work.
git wipgit add --all && git commit --no-verify -m WIPSave everything in a WIP commit before switching context.

History

git lggit log --graph --oneline --decorate --allAll branches as a graph, one line per commit.
git lastgit log -1 HEAD --statThe last commit and the files it changed.
git todaygit log --since=midnight --oneline --no-mergesWhat was committed today (handy for the stand-up).
git whogit shortlog -sne --branches --remotes --no-mergesCommits per author.
git wordgit diff --word-diffDiff word by word: perfect for text and docs.
git stagedgit diff --cachedWhat will go into the next commit.

Undo

git unstagegit restore --stagedRemove a file from the index, keep your changes.
git undo Cautiongit reset --soft HEAD~1Undo the last commit, keep its changes staged.
git amend Cautiongit commit --amend --no-editAdd the staged changes to the last commit (not if already pushed).
git fixupgit commit --fixupgit fixup <sha>: a fix to squash later with rebase -i --autosquash.
git nevermind Destructivegit reset --hard HEAD && git clean -fdThrow away EVERY uncommitted change and new file. No undo.

Branches and tools

git recentgit branch --sort=-committerdate --format=%(committerdate:relative)%09%(refname:short)Your branches, most recent first, with their age.
git mergedgit branch --mergedBranches already merged into the current one (safe to delete).
git gonegit fetch --prune && git branch -vv | grep ': gone]' | awk '{print $1}'Local branches whose remote branch was deleted.
git rootgit rev-parse --show-toplevelPath of the repository root.
git aliasesgit config --get-regexp ^alias\.List your aliases (when you forget them).

Your own alias

Result

13 aliases

Run git config --global --edit and paste this at the end of the file. Works on every system.

~/.gitconfig

[alias]
	st = status -sb
	sw = switch
	br = branch
	cm = commit -m
	sync = pull --rebase --autostash
	pushf = push --force-with-lease
	lg = log --graph --oneline --decorate --all
	last = log -1 HEAD --stat
	staged = diff --cached
	unstage = restore --staged
	undo = reset --soft HEAD~1
	recent = branch --sort=-committerdate --format=%(committerdate:relative)%09%(refname:short)
	aliases = "config --get-regexp ^alias\\."