gitconfig: remove branch.autosetupmerge

It really isn't what I wanted, far from it.