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

Re: [PATCH] rebase -i: handle fixup of root commit correctly

From
Chris Webb <chris@arachsys.com>
Date
Jul 31, 2012, 22:47 UTC
Message-ID
<20120731224704.GD2823@arachsys.com>
In-Reply-To
<50183A4C.9080706@kdbg.org>
Johannes Sixt <j6t@kdbg.org> writes:
> One subtlety to watch out for is when commit messages are edited. That is,
> if you edit the proposed message at 'rebase --continue' after the first
> squash failed, is the new text preserved until the last squash? I *think*
> that previously that was the case.

Hi. Yes, doing this seems to work fine both in the original code, and after my patch. I've just checked to be certain using my previous test case of four conflicting squashes again, editing the message at each stage and ensuring the edits are all retained in the final commit.

Best wishes,
Chris.
Previous: Johannes Sixt
Message 7 of 7 in “rebase -i: handle fixup of root commit correctly”
  1. rebase -i: handle fixup of root commit correctlyChris Webb, Jul 24, 2012
  2. Junio C HamanoJul 24, 2012
  3. Johannes SixtJul 31, 2012
  4. Chris WebbJul 31, 2012
  5. Chris WebbJul 31, 2012
  6. Johannes SixtJul 31, 2012
  7. Chris WebbJul 31, 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.