diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-08-10 02:18:16 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-08-10 02:18:16 +0300 |
commit | e8c53ff91282861d4efe5d807129a55e193e6451 (patch) | |
tree | ab211df1696719021339b621c31ad26ddd32585d /prio-queue.c | |
parent | 8cdd5e713d7ba54b9d26ac997408bb745ab55088 (diff) | |
parent | 6ce7afe16384b741f1ee4c5f310fa4a9f66348ba (diff) |
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
Diffstat (limited to 'prio-queue.c')
0 files changed, 0 insertions, 0 deletions