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

Re: [PATCH] sequencer: remove additional blank line

From
JHJunio C Hamano <jch@google.com>
Date
Apr 19, 2012, 22:38 UTC
Message-ID
<xmqq8vhruz3g.fsf@junio.mtv.corp.google.com>
In-Reply-To
<1334783245-8733-1-git-send-email-ralf.thielow@googlemail.com>
Ralf Thielow <ralf.thielow@googlemail.com> writes:
Show 12 quoted lines
> Remove an additional blank line between the
> headline and the list of conflicted files after
> doing a recursive merge.
>
> Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
> ---
> Normally, the list of conflicted files come directly after
> the headline like this
>
>     Conflicts:
>         folder/file
> 	...
Hrm.

A funny thing is that your "Normally" is a misconception caused by a regression in 1c7b76be (Build in merge, Jul 7, 2008). Before that change, this message was "Conflicts:" followed by an empty line and it was consistently so between "merge" and "cherry-pick", but the C rewrite of "git merge" broke it.

I do not care deeply either way; unifying them again to use one less line is probably fine.

Previous: Ralf Thielow
Message 2 of 2 in “sequencer: remove additional blank line”
  1. sequencer: remove additional blank lineRalf Thielow, Apr 18, 2012
  2. Junio C HamanoApr 19, 2012

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.