]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cf96b39 3e367a5)
Merge branch 'ja/rebase-i-avoid-amending-self' into maint-2.38
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2022 00:11:34 +0000 (17:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2022 00:11:34 +0000 (17:11 -0700)
commit7f8a6caee563de5b1df31f698dfbe4b55a6b2bea
treee4c45f15a9d08422a4187a1ee420d0e21dbe9f48tree | snapshot
parentcf96b393d62df78fe1b19e599a026d2eef303828commit | diff
parent3e367a5f2f53f19130b90a97c3e2668eca3461aecommit | diff
Merge branch 'ja/rebase-i-avoid-amending-self' into maint-2.38

"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 diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.