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

Re: Show skipped commit message after rebase conflict?

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 26, 2025, 00:04 UTC
Message-ID
<xmqq5xff3jhc.fsf@gitster.g>
In-Reply-To
<CAAVFnN=S-bu1FNafyyH797AeBxUu+8vk5yJ5xaxCUBkBZin_6w@mail.gmail.com>
Cameron Steffen <cam.steffen94@gmail.com> writes:
Show 9 quoted lines
>> But only if we can positively tell the reason why there is no change
> relative to the parent commit _is_ because the commit we are
> currently picking has already been applied, that is.
>
> I thought we merely would need to see that there are no staged changes
> to be committed, and there is a currently-picking commit that will now
> be skipped? I don't need to know whether the commit was already
> applied. I just want to know that the commit in the rebase plan is not
> being committed.
Then your earlier idea to reuse the same message
>> warning: skipped previously applied commit <hash>
>
> Potentially we could use the very same message.
would not work, would it?
Previous: Cameron SteffenNext: Cameron Steffen
Message 7 of 11 in “Show skipped commit message after rebase conflict?”
  1. Cameron SteffenJul 24, 2025
  2. Junio C HamanoJul 24, 2025
  3. Phillip WoodJul 25, 2025
  4. Cameron SteffenJul 25, 2025
  5. Junio C HamanoJul 25, 2025
  6. Cameron SteffenJul 25, 2025
  7. Junio C HamanoJul 26, 2025
  8. Cameron SteffenJul 26, 2025
  9. Johannes SixtJul 26, 2025
  10. Cameron SteffenJul 26, 2025
  11. Junio C HamanoJul 25, 2025

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.