.gitconfig: add merge.defaultToUpstream=true
.gitconfig: M-x tabify, because that's what the git-config tools do