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

Re: [PATCH] rebase: mention --abort alongside --continue

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Jun 17, 2026, 09:52 UTC
Message-ID
<bd7dc183-6597-4fd0-ae64-682d46480cd4@gmail.com>
In-Reply-To
<xmqqpl1q2xw5.fsf@gitster.g>
On 16/06/2026 18:33, Junio C Hamano wrote:
Show 23 quoted lines
> Phillip Wood <phillip.wood123@gmail.com> writes:
> 
>> Hi Harald
>>
>> On 15/06/2026 20:19, Harald Nordgren via GitGitGadget wrote:
>>> From: Harald Nordgren <haraldnordgren@gmail.com>
>>>
>>> The warning shown when an "exec" step fails and the "git status"
>>> advice while splitting or editing a commit pointed users at "git
>>> rebase --continue" but not "--abort". Mention it in both, matching
>>> the conflict case.
>>
>> I'm not sure that the "failed exec" and "conflicts" cases are equivalent
>> though. If you have some nasty conflict that you don't want to resolve
>> then aborting and trying another approach such is incrementally rebasing
>> is the only option. If an exec command fails then it likely means that a
>> test has failed or some something similar which is minor inconvenience
>> which needs fixing before continuing - it seems very unlikely that the
>> user would want to abort the rebase.
> 
> It is very true that users who know what they are doing and got into
> such conflicts are opted to go into such a situation tnat it is
> unlikely that they would appreciate a choice to abort.

That's not quite what I was trying to say which was that aborting in the case of conflicts is more likely than in the case of a failed exec.

Show 10 quoted lines
> But given that for any system, everybody starts as a newbie, it may
> be assuring to always give "here is a way out" option when they get
> in a nasty confusing situation.  Discouraging the way to use the
> tool that can lead to confusing situation by guiding them with BCP
> workflows would help, but they always get into pitfall.
> 
> The patch adds new message into the existing message to suggest how
> to move forward, but as a training wheel option, it may not be a bad
> thing to offer "--abort" as an extra hint, separate from the
> existing warning() message.

So if I've understood we'd print a message explaining what's happened and how to continue followed by a hint about aborting. The message would depend on what problem caused the rebase to stop, but the hint would be the same in each case. That sounds fine to me.

Thanks
Phillip
Previous: Harald NordgrenNext: Junio C Hamano
Message 5 of 14 in “rebase: mention --abort alongside --continue”
  1. rebase: mention --abort alongside --continueHarald Nordgren via GitGitGadget, Jun 15, 2026
  2. Phillip WoodJun 16, 2026
  3. Junio C HamanoJun 16, 2026
  4. Harald NordgrenJun 17, 2026
  5. Phillip WoodJun 17, 2026
  6. Junio C HamanoJun 17, 2026
  7. Harald NordgrenJun 18, 2026
  8. Junio C HamanoJun 19, 2026
  9. Harald NordgrenJul 16, 2026
  10. Phillip WoodJul 16, 2026
  11. Junio C HamanoJul 16, 2026
  12. Harald NordgrenJul 18, 2026
  13. Phillip WoodJul 18, 2026
  14. Junio C HamanoJul 20, 2026

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.