freshlybakedca.ke / git
Git fork
fork atom

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

Junio C Hamano d549c188 8c3d7c5f

+2
unified split
+1
sequencer.c
··· 2721 2721 return error(_("cannot squash merge commit into another commit")); 2722 2722 2723 2723 case TODO_MERGE: 2724 + case TODO_DROP: 2724 2725 return 0; 2725 2726 2726 2727 default:
+1
t/t3404-rebase-interactive.sh
··· 2263 2263 edit $oid 2264 2264 fixup $oid 2265 2265 squash $oid 2266 + drop $oid # acceptable, no advice 2266 2267 EOF 2267 2268 ( 2268 2269 set_replace_editor todo &&