Sean Gies <Sean.Gies@xxxxxxxxxx> writes: > When I specify the "--ff" option to git-merge, I expect it to perform a > fast-forward merge or none at all. That expectation needs to be adjusted with s/--ff/--ff-only/, I think. The "--no-ff" option says "Never do fast-forward and always create extra commit even when the side branch is a descendant", and the "--ff" option is a way to countermand it, i.e. "It is ok to fast-forward this merge". And there is another one "I do not want anything bug fast forward", and that is spelled --ff-only. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html