git rebase: ensure --preseve-merges is always used

If --preserved-merges is not used during a rebase and there is an
unpushed merge, the commits will be linearized (the merge commit
removed) and replayed on top of the origin with new hashes.

We had surely intended this to be so, but must have msised a few.