From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Nov 2023 07:53:17 +0000 (+0900)
Subject: Merge branch 'pw/rebase-i-after-failure' into maint-2.42
X-Git-Tag: v2.42.1~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a70f725c06bb28c1f79c8e30ea9cdb30c45383d0;p=thirdparty%2Fgit.git

Merge branch 'pw/rebase-i-after-failure' into maint-2.42

Various fixes to the behaviour of "rebase -i" when the command got
interrupted by conflicting changes.
cf. <6b927687-cf6e-d73e-78fb-bd4f46736928@gmx.de>

* pw/rebase-i-after-failure:
  rebase -i: fix adding failed command to the todo list
  rebase --continue: refuse to commit after failed command
  rebase: fix rewritten list for failed pick
  sequencer: factor out part of pick_commits()
  sequencer: use rebase_path_message()
  rebase -i: remove patch file after conflict resolution
  rebase -i: move unlink() calls
---

a70f725c06bb28c1f79c8e30ea9cdb30c45383d0