adds m/ff alias distinction for --no-ff and --ff-only merges