Re: 'next' will be rewound shortly

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

Attachment: pgp7OcylnCm4W.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux