git: make --ff-only the default for merges