From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 3 Sep 2021 20:49:28 +0000 (-0700)
Subject: Merge branch 'pw/rebase-skip-final-fix'
X-Git-Tag: v2.34.0-rc0~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ba5a0b3ba34270b2b57b75f4cce8454a7cc5eeb;p=thirdparty%2Fgit.git

Merge branch 'pw/rebase-skip-final-fix'

Checking out all the paths from HEAD during the last conflicted
step in "git rebase" and continuing would cause the step to be
skipped (which is expected), but leaves MERGE_MSG file behind in
$GIT_DIR and confuses the next "git commit", which has been
corrected.

* pw/rebase-skip-final-fix:
  rebase --continue: remove .git/MERGE_MSG
  rebase --apply: restore some tests
  t3403: fix commit authorship
---

0ba5a0b3ba34270b2b57b75f4cce8454a7cc5eeb