.gitconfig: spaces to tabs
.gitconfig: aliases for "branch" and "mergetool"