aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/commit-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-10-25 17:11:34 -0700
committerJunio C Hamano <gitster@pobox.com>2022-10-25 17:11:34 -0700
commit7f8a6caee563de5b1df31f698dfbe4b55a6b2bea (patch)
treee4c45f15a9d08422a4187a1ee420d0e21dbe9f48 /builtin/commit-tree.c
parentMerge branch 'jk/fsck-on-diet' into maint-2.38 (diff)
parentsequencer: avoid dropping fixup commit that targets self via commit-ish (diff)
downloadgit-7f8a6caee563de5b1df31f698dfbe4b55a6b2bea.tar.gz
git-7f8a6caee563de5b1df31f698dfbe4b55a6b2bea.zip
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
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions