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>
Nicolas Vigier committed
Feb 1, 2014 at 02:18 UTC
e4a4e7f27ad5d7a8534608b9a4d2d19ee6238925
1 file changed
+1
-1
git-rebase.sh
+1
-1
@@ -267,7 +267,7 @@ do
267
--no-fork-point)
268
fork_point=
269
;;
270
- -M|-m)
270
+ -m)
271
do_merge=t
272
;;
273
-X)