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

Re: git merge <tag>: Spawning an editor can't be disabled

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 9, 2012, 19:54 UTC
Message-ID
<7v4nuzwzn4.fsf@alter.siamese.dyndns.org>
In-Reply-To
<4F34158D.3030903@kdbg.org>
Johannes Sixt <j6t@kdbg.org> writes:
> It should behave as if the editor was spawned and the user did not
> change the content of the commit message.
> ...
> Contrived? Dunno.
No, just "Sane".

Thanks. And I think Jonathan's original patch is just fine as-is; the commented verification result should be stripspace()'ed out when we make the final commit if we do so ourselves, and will stay if the user ends up having to help resolving the merge.

Previous: Johannes SixtNext: Jonathan Nieder
Message 4 of 7 in “Re: git merge <tag>: Spawning an editor can't be disabled”
  1. Jonathan NiederFeb 9, 2012
  2. Junio C HamanoFeb 9, 2012
  3. Johannes SixtFeb 9, 2012
  4. Junio C HamanoFeb 9, 2012
  5. Jonathan NiederFeb 9, 2012
  6. Junio C HamanoFeb 9, 2012
  7. Junio C HamanoFeb 9, 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.