Skip to content

Instantly share code, notes, and snippets.

@rkachowski
Created April 13, 2016 09:17
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save rkachowski/3f68d6e3e2ea50f79db4ae852dadc838 to your computer and use it in GitHub Desktop.
Save rkachowski/3f68d6e3e2ea50f79db4ae852dadc838 to your computer and use it in GitHub Desktop.
the almighty .gitconfig
[alias]
s = status
cma = commit -am
cm = commit -m
cont = rebase --continue
dumbass = commit --amend
forget = update-index --assume-unchanged
unforget = update-index --no-assume-unchanged
root = rev-parse --show-toplevel
lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit"
conflicts = !"git merge --no-commit \"$1\" | grep --color=no CONFLICT && git merge --abort"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment