]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c44beea 4d491ad)
Merge branch 'js/rebase-i-allow-drop-on-a-merge'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2025 20:46:56 +0000 (13:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2025 20:46:57 +0000 (13:46 -0700)
commit1fe6955fd4e0de21a5581376589c8df56fae6adf
tree23a6df77791993ec24d8fda0aa7bf21ebd0f4d96tree | snapshot
parentc44beea485f0f2feaf460e2ac87fdd5608d63cf0commit | diff
parent4d491ade8f6597904a7b79ff5d34f8524f915ac2commit | diff
Merge branch 'js/rebase-i-allow-drop-on-a-merge'

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.