On 25/07/2023 21:57, Junio C Hamano wrote:
* pw/rebase-i-after-failure (2023-04-21) 6 commits - rebase -i: fix adding failed command to the todo list - rebase: fix rewritten list for failed pick - rebase --continue: refuse to commit after failed command - sequencer: factor out part of pick_commits() - rebase -i: remove patch file after conflict resolution - rebase -i: move unlink() calls Various fixes to the behaviour of "rebase -i" when the command got interrupted by conflicting changes. Will discard. Have been expecting a reroll for too long.
I am slowly working on a new version, but it probably makes sense to drop it in the meantime as it has been so long that the new version probably wants to be rebased onto master anyway.
Best Wishes Phillip
cf. <xmqqsfcthrpb.fsf@gitster.g> cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@xxxxxxxxx> cf. <55dd6194-25e5-1a66-9c39-27cb19bfbb3c@xxxxxxxxx> source: <pull.1492.v2.git.1682089074.gitgitgadget@xxxxxxxxx>
