.gitconfig: alias m to merge