merge script: --ff-only to disallow true merge