From: Nicolas Vigier <boklm@mars-attacks.org>
Date: Sat, 1 Feb 2014 02:18:03 +0000 (+0000)
Subject: rebase: don't try to match -M option
X-Git-Tag: v2.0.0-rc0~150^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e4a4e7f27ad5d7a8534608b9a4d2d19ee6238925?hp=2f9dc1fb529662e157c53c7d91e5f75e0f72c6ea

rebase: don't try to match -M option

The -M option does not exist in OPTIONS_SPEC, so there is no use to try
to find it.

Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase.sh b/git-rebase.sh
index d1835ba58a..3b55211081 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -267,7 +267,7 @@ do
 	--no-fork-point)
 		fork_point=
 		;;
-	-M|-m)
+	-m)
 		do_merge=t
 		;;
 	-X)