[PATCH 6/8] rebase: don't try to match -M option

From: Nicolas Vigier <boklm@mars-attacks.org>
Date: Nov 3, 2013, 15:54 UTC
Message-ID: <1383494064-5653-7-git-send-email-boklm@mars-attacks.org>
In-Reply-To: <1383494064-5653-1-git-send-email-boklm@mars-attacks.org>

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>
---
 git-rebase.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-rebase.sh b/git-rebase.sh
index 6b9279a69028..2f2f8ded5c3f 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -259,7 +259,7 @@ do
 	--no-autosquash)
 		autosquash=
 		;;
-	-M|-m)
+	-m)
 		do_merge=t
 		;;
 	-X)

-- 
1.8.4.2