the almighty .gitconfig

.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"