explicitly disable merge commits

git suddenly started asking for committer info, which it hopefully
doesn't need if it can't commit...?