git-pull: refuse default merge without branch.*.merge