From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Aug 2023 23:18:16 +0000 (-0700)
Subject: Merge branch 'pw/rebase-skip-commit-message-fix'
X-Git-Tag: v2.42.0-rc1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8c53ff91282861d4efe5d807129a55e193e6451;p=thirdparty%2Fgit.git

Merge branch 'pw/rebase-skip-commit-message-fix'

"git rebase -i" with a series of squash/fixup, when one of the
steps stopped in conflicts and ended up getting skipped, did not
handle the accumulated commit log messages, which has been
corrected.

* pw/rebase-skip-commit-message-fix:
  rebase --skip: fix commit message clean up when skipping squash
---

e8c53ff91282861d4efe5d807129a55e193e6451