turn off fast-forward merging by default

Merge runs that should not generate a commit can be done with rebase
instead. On the other hand myrepos should do ff most of the time.