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
Jul 16, 2026, 09:37 UTC
Message-ID
<4d150f21-46ea-4bf7-b516-c1763c152b34@gmail.com>
In-Reply-To
<CAHwyqnVy=4oHBTmtDJ6jX38Kh1aLYYXHR-_12DdiiUxpXZ5kNg@mail.gmail.com>
Hi Harald
On 16/07/2026 07:02, Harald Nordgren wrote:
Show 6 quoted lines
> I'll revive this discussion because the 'git rebase --keep-base -x'
> case still bothers me.
> 
> When getting stuck in the middle of an operation, it just makes sense
> to offer a way forward and a way back, why be more obtuse than we need
> to?

I'm still not clear why you'd want to abort after a failed exec. In the example you gave earlier in the thread where the exec command was trying to run a command that did not exist isn't the solution to edit the todo list to fix that, or if just this exec command is wrong, continue the rebase?

In the latter case it would be useful is to teach "git rebase --skip" to skip a failed exec command that has been rescheduled by "--reschedule-failed-exec" and provide a hint to the user that they can skip the rescheduled command. We could potentially add a hint to suggest that if the failure was due to a bad command then the user should edit the todo list.

To me aborting a rebase because an exec command failed is almost never a sensible route forward and we should not be encouraging users to abort after a failed test - surely the sensible thing to do in that case is fix the problem with "git commit --amend" and continue the rebase.

Thanks
Phillip
Previous: Harald NordgrenNext: Junio C Hamano
Message 10 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.