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 d1835ba58a253618ff4903d1b8c13749d285837c..3b5521108180f196a0118d779e0ed1ee844b3598 100755 (executable)
--- 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)