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

Re: Antw: Re: blank lines in pre-created merge message

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jul 25, 2019, 11:58 UTC
Message-ID
<nycvar.QRO.7.76.6.1907251355500.21907@tvgsbejvaqbjf.bet>
In-Reply-To
<5D39812C020000A10003265F@gwsmtp.uni-regensburg.de>
Hi Ulrich,
On Thu, 25 Jul 2019, Ulrich Windl wrote:
Show 12 quoted lines
> >>> Johannes Schindelin <Johannes.Schindelin@gmx.de> schrieb am 25.07.2019 um
> 12:07
> in Nachricht <nycvar.QRO.7.76.6.1907251204310.21907@tvgsbejvaqbjf.bet>:
> >
> > On Wed, 24 Jul 2019, Ulrich Windl wrote:
> >
> >> 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 fiVrst line.
>
> [...]
> Could anybody provide a rough overview how and where these editor
> comments are created?

The best bet would be to call `git grep` with text in that pre-created merge message, preferably some text that is most likely fixed, i.e. that does not depend on the current worktree/commit.

If you give me an example of such a merge message, I can provide you with the appropriate `git grep` call and the code locations to touch.

Ciao, Johannes

Previous: Ulrich WindlNext: Ulrich Windl
Message 4 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.