]> git.ipfire.org Git - thirdparty/git.git/commit - t/t7011-skip-worktree-reading.sh
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)
commitdc154c39f7303baaf6cad8982a814b28a3a2027a
treecb8687b0409913480a5242726a5d34200e4820fd
parent83b2b47850ab68c0bbdf387fe5fa9fd2a48837d8
parent3e367a5f2f53f19130b90a97c3e2668eca3461ae
Merge branch 'ja/rebase-i-avoid-amending-self'

"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
sequencer.c