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

Problems in Default merge message

From
UWUlrich Windl <ulrich.windl@rz.uni-regensburg.de>
Date
Aug 24, 2017, 09:01 UTC
Message-ID
<599E9607020000A100027965@gwsmtp1.uni-regensburg.de>
In-Reply-To
<599E9607020000A100027965@gwsmtp1.uni-regensburg.de>
Hi!
I'd like to report an old-time bug in git, regarding the default message visible for a "git merge --no-commit" (at the later commit, of course):
* When merging a branch, the first name is put in single quotes, while the second is not.
* There is no blank line after the first one
* there are two blank lines further down
I'll attach a sample default merge file as found in the editor.
I suggest to put both branches in single quotes, and to either remove the two blank lines, or make them comment lines (for visual separation)

Regards, Ulrich

Message 1 of 1 in “Problems in Default merge message”
  1. Ulrich WindlAug 24, 2017

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.