Couple of my favorite git aliases

.gitconfig

[alias]
        st = status
        di = diff
        staged = "diff --staged"
        amend = "commit --amend"
        delete-merged = "!git branch --merged | egrep -v '^\\*' | xargs git branch -d"
        pad = "!git pull ${1:-origin} --prune && git delete-merged"
        fad = "!git fetch  ${1:-origin} --prune && git delete-merged"