.gitconfig

[alias]
        st  = status
        pr  = pull --rebase
        dc  = diff --cached
        dcw = diff --cached --color-words
        dw  = diff --color-words
        cm = commit -m
        fix = commit --amend
        graph = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
        update = "!echo '==> Stash local changes'; res=$(git stash save 'auto stash by update'); echo "$res"; echo; \
                   echo '==> Fetch from remote repo and merge/rebase'; git pull --rebase; echo; \
                   echo "$res" | grep -q '^No local changes to save' \
                   || { echo '==> Apply stashed changes'; git stash pop; }"
[user]
        name = Philip Mueller
        email = mail@philip.in-aachen.net
[color]
        ui = true
[push]
        default = current
[mergetool]
        prompt = false
[merge]
        tool = labeled-meld
[mergetool "labeled-meld"]
        cmd = /usr/bin/meld --output $MERGED \
              $LOCAL  --label 'current branch' \
              $BASE   --label 'common base (and result file)' \
              $REMOTE --label 'to be merged' \
              2>/dev/null
        trustExitCode = false