My .gitconfig

.gitconfig

[alias]
        st = status --short --branch
        dc = diff --cached -M -B -C
        typo = commit --amend
        fixup = commit --amend --no-edit
        logk = log --graph --pretty=\"format:%C(yellow)%h%C(red)%d%Creset %s %C(green)%an, %ar%Creset\"
        ffpull = pull --ff-only
        ffmerge = merge --ff-only
        ri = "!f() { rev=$(git rev-parse $1 2>/dev/null) || rev=HEAD~$1; git rebase -i $rev; }; f"
        rc = rebase --continue
        ra = rebase --abort
        rs = rebase --skip
        whoami = !echo \"$(git config --get user.name) <$(git config --get user.email)>\"
[color]
        ui = auto
[push]
        default = simple
[rebase]
        autosquash = true
[credential]
        helper = cache

Moved to https://gist.github.com/akheron/61a01d597360c0187dc4