bash: add the merge option --ff-only