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

blank lines in pre-created merge message

From
UWUlrich Windl <ulrich.windl@rz.uni-regensburg.de>
Date
Jul 24, 2019, 09:54 UTC
Message-ID
<5D382AC1020000A100032608@gwsmtp.uni-regensburg.de>
Hi!

I think I had tried bringing this to your attention before, but I think it was without success. The issue may seem purely cosmetical, while being easy to fix (is my guess):

When using "git merge --no-ff --no-commit ..", the pre-created merge message always contains two empty lines in between the comment lines. However if there was a merge conflict (being resolved) an extra blank line is added after the first line.

In vi those empty lines are easy to spot, and I routinely remove them. But maybe it's better not to create them at the beginning. (A "normal commit" never creates any emüpty lines in the pre-created comment)

My Git version is 2.12.3, but the bug is probably quite old...

Regards, Ulrich Windl

Next: Johannes Schindelin
Message 1 of 7 in “blank lines in pre-created merge message”
  1. Ulrich WindlJul 24, 2019
  2. Johannes SchindelinJul 25, 2019
  3. Antw: Re: blank lines in pre-created merge messageUlrich Windl, Jul 25, 2019
  4. Johannes SchindelinJul 25, 2019
  5. Ulrich WindlJul 30, 2019
  6. Johannes SchindelinJul 31, 2019
  7. Johannes SchindelinAug 2, 2019

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.