diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-08-09 16:18:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-09 16:18:16 -0700 |
| commit | e8c53ff91282861d4efe5d807129a55e193e6451 (patch) | |
| tree | ab211df1696719021339b621c31ad26ddd32585d /diff.c | |
| parent | Merge branch 'ma/locate-in-path-for-windows' (diff) | |
| parent | rebase --skip: fix commit message clean up when skipping squash (diff) | |
| download | git-e8c53ff91282861d4efe5d807129a55e193e6451.tar.gz git-e8c53ff91282861d4efe5d807129a55e193e6451.zip | |
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 'diff.c')
0 files changed, 0 insertions, 0 deletions