git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: 'next' will be rewound shortly

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Jun 27, 2008, 19:28 UTC
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:
Show 7 quoted lines
> -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. ;-)
Previous: Stephan BeyerNext: Junio C Hamano
Message 7 of 15 in “[ANNOUNCE] GIT 1.5.6”
  1. Junio C HamanoJun 18, 2008
  2. A note from the maintainerJunio C Hamano, Jun 19, 2008
  3. 'next' will be rewound shortlyJunio C Hamano, Jun 19, 2008
  4. Stephan BeyerJun 27, 2008
  5. Miklos VajnaJun 27, 2008
  6. Stephan BeyerJun 27, 2008
  7. Miklos VajnaJun 27, 2008
  8. Junio C HamanoJun 27, 2008
  9. Miklos VajnaJun 27, 2008
  10. Stephan BeyerJun 27, 2008
  11. Junio C HamanoJun 28, 2008
  12. A note from the maintainerJunio C Hamano, Jul 14, 2008
  13. Steffen ProhaskaJun 22, 2008
  14. [ANNOUNCE] GIT 1.5.6.1Junio C Hamano, Jun 26, 2008
  15. Steffen ProhaskaJul 1, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.