From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Oct 2025 17:29:27 +0000 (-0700)
Subject: Merge branch 'js/rebase-i-allow-drop-on-a-merge' into maint-2.51
X-Git-Tag: v2.51.1~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d549c188be4f041a117d3ca942a5ac1e5f9fc704;p=thirdparty%2Fgit.git

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
---

d549c188be4f041a117d3ca942a5ac1e5f9fc704