From: Miklos Vajna <vmiklos@frugalware.org>
Date: Fri, 27 Jun 2008 19:28:19 GMT
Subject: Re: 'next' will be rewound shortly
Message-ID: <20080627192819.GC2058@genesis.frugalware.org>
In-Reply-To: <20080627171948.GC6201@leksak.fem-net>

On Fri, Jun 27, 2008 at 07:19:48PM +0200, Stephan Beyer <s-beyer@gmx.net> 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. ;-)