.gitconfig

[user]
        name = Allan Beaufour
        email = ...

[color]
        ui = auto

[pack]
        threads = 0

[diff]
        renamelimit = 0

[push]
        default = tracking

[core]
        editor = emacs -q

[alias]
        st = status
        ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
        ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
        lol = log --graph --decorate --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --abbrev-commit
        am = commit --amend --reuse-message=HEAD
        cp = cherry-pick
        co = checkout
        diffm = diff origin/master..HEAD
        logm = log origin/master..HEAD
        sup = !git stash && git up && git pop
        pp = !git pull && git push
        rb = rebase origin/master
        rbi = rebase -i origin/master

[branch]
        autosetuprebase = always

[rerere]
        enabled = 1