For me it would be good enough if there were some way of making
"pull --rebase" error out in the case that merges are involved. I'll
then either do a pull --no-rebase, or deal with the situation in some
other way; but getting the merge "flattened" by "git pull" without being
told about it is what's frustrating to me.