On Wed, Oct 21, 2009 at 02:46:50PM -0700, Junio C Hamano wrote: > Make --no-commit imply --no-ff; --no-commit is a request by the user to > tweak the resulting merge and it is clear indication that the user wants > to have a merge, even if it is an extra one, to futz with. I think --no-commit makes sense in case of a real merge, because a 3-way diff can help fix any semantic errors. Apart from that, one can simply do a regular merge and --amend it later. In case of a fast-forward merge, there is not going to be a 3-way diff anyways. So it's pointless to use --no-commit in this case. I'm therefore in favor of your other proposal, even though it may be confusing to users who don't understand the difference between n-way and fast-forward merge. But that's something they will have to learn. And --no-ff can always be used explicitly. Clemens -- 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