tree ab211df1696719021339b621c31ad26ddd32585d
parent 8cdd5e713d7ba54b9d26ac997408bb745ab55088
parent 6ce7afe16384b741f1ee4c5f310fa4a9f66348ba
author Junio C Hamano <gitster@pobox.com> 1691623096 -0700
committer Junio C Hamano <gitster@pobox.com> 1691623096 -0700

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