Adds merge --ff-only as gitff