]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'pw/rebase-i-cleanup-fix' into maint-2.51
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2025 17:29:31 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2025 17:29:31 +0000 (10:29 -0700)
"git rebase -i" failed to clean-up the commit log message when the
command commits the final one in a chain of "fixup" commands, which
has been corrected.

* pw/rebase-i-cleanup-fix:
  sequencer: remove VERBATIM_MSG flag
  rebase -i: respect commit.cleanup when picking fixups

1  2 
sequencer.c
t/t3415-rebase-autosquash.sh

diff --cc sequencer.c
Simple merge
Simple merge