Subject: Re: 'next' will be rewound shortly

From: Junio C Hamano <[email-masked]>
Date: Fri, 27 Jun 2008 14:28:29 -0700

Miklos Vajna <[email-masked]> writes:

> On Fri, Jun 27, 2008 at 07:19:48PM +0200, Stephan Beyer <[email-masked]> wrote:
>> -m <msg>::
>> 	The commit message to be used for the merge commit (in case
>> 	it is created). The `git-fmt-merge-msg` script can be used
>> 	to give a good default for automated `git-merge` invocations.
>> 
>> So it is not mentioned that a standard message is appended, and thus the
>> original behavior is somehow "buggy" :)
>
> Ah, OK. Then the code and the documentation differs and that's a bug,
> sure.
>
> From git-merge.sh:
>
> # All the rest are the commits being merged; prepare
> # the standard merge summary message to be appended to
> # the given message.
>
> I did builtin-merge based on git-merge.sh, not the manpage. ;-)

Following git tradition, manpage came after the command's behaviour has
been long established.  It will be a behaviour change, and it is open to
debate if the new behaviour is better or if the proposed change of
behaviour hurts existing users.