From: Paolo Bonzini <bonzini@gnu.org>
Date: Sun, 20 Sep 2009 14:04:40 GMT
Subject: Re: merge ignores --no-commit in fast-forward case
Message-ID: <4AB63678.6010500@gnu.org>
In-Reply-To: <7viqff97l4.fsf@alter.siamese.dyndns.org>

On 09/19/2009 01:05 AM, Junio C Hamano wrote:
> If "surprising" is the problem (and it certainly is), perhaps it would be
> better to rewrite it not to be so surprising, like:
>
>          --no-commit::
>                  Do not create a new commit.

Do not create a new _merge_ commit, and it's perfect.

Paolo