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

Re: [PATCH v3] Teach merge the '[-e|--edit]' option

From
Jay Soffian <jaysoffian@gmail.com>
Date
Oct 11, 2011, 00:09 UTC
Message-ID
<CAG+J_Dz4x7CmHKXx-9p-ZxmiuFyE2v3TFwkXfYgyc-p37ONinQ@mail.gmail.com>
In-Reply-To
<7v1uukieh2.fsf@alter.siamese.dyndns.org>
On Mon, Oct 10, 2011 at 5:00 PM, Junio C Hamano <gitster@pobox.com> wrote:
> So if we drop the "conditionally add '\n'" part in builtin/merge.c from my
> "how about this on top" patch and we should be ready to go, right?

Yes. I can send a followup patch adding an additional test case next week (for the case where the editor zeros out the message).

Thanks Junio!
j.
Previous: Junio C HamanoNext: Peter Krefting
Message 5 of 6 in “Teach merge the '[-e|--edit]' option”
  1. Teach merge the '[-e|--edit]' optionJay Soffian, Oct 8, 2011
  2. Junio C HamanoOct 10, 2011
  3. Jay SoffianOct 10, 2011
  4. Junio C HamanoOct 11, 2011
  5. Jay SoffianOct 11, 2011
  6. Peter KreftingOct 11, 2011

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.