]> git.ipfire.org Git - thirdparty/git.git/commit - alloc.h
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8cdd5e7 6ce7afe)
Merge branch 'pw/rebase-skip-commit-message-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Aug 2023 23:18:16 +0000 (16:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Aug 2023 23:18:16 +0000 (16:18 -0700)
commite8c53ff91282861d4efe5d807129a55e193e6451
treeab211df1696719021339b621c31ad26ddd32585dtree | snapshot
parent8cdd5e713d7ba54b9d26ac997408bb745ab55088commit | diff
parent6ce7afe16384b741f1ee4c5f310fa4a9f66348bacommit | 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
sequencer.c diff1 | diff2 | blob | history
t/test-lib-functions.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.