Allow to merge with --ff-only option