running --no-ff and --ff-only at the same time would create an error in git. I put it in the eventuality the someone adds the 2 options (should not happen, but never know)