]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8c3d7c5 4d491ad)
Merge branch 'js/rebase-i-allow-drop-on-a-merge' into maint-2.51
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2025 17:29:27 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2025 17:29:27 +0000 (10:29 -0700)
commitd549c188be4f041a117d3ca942a5ac1e5f9fc704
treea1541dc6dd58f29fee40fd2bded9212d935b4090tree | snapshot
parent8c3d7c5f1104e1d1935f91f5852c82df0c5b0adacommit | diff
parent4d491ade8f6597904a7b79ff5d34f8524f915ac2commit | diff
Merge branch 'js/rebase-i-allow-drop-on-a-merge' into maint-2.51

During interactive rebase, using 'drop' on a merge commit lead to
an error, which was incorrect.

* js/rebase-i-allow-drop-on-a-merge:
  rebase -i: permit 'drop' of a merge commit
sequencer.c diff1 | diff2 | blob | history
t/t3404-rebase-interactive.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.