]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ja/rebase-i-avoid-amending-self'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2022 17:08:43 +0000 (10:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2022 17:08:43 +0000 (10:08 -0700)
"git rebase -i" can mistakenly attempt to apply a fixup to a commit
itself, which has been corrected.

* ja/rebase-i-avoid-amending-self:
  sequencer: avoid dropping fixup commit that targets self via commit-ish

1  2 
sequencer.c

diff --cc sequencer.c
Simple merge