Skip to content

Commit e4a4e7f

Browse files
boklmgitster
authored andcommitted
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>
1 parent 2f9dc1f commit e4a4e7f

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

git-rebase.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ do
267267
--no-fork-point)
268268
fork_point=
269269
;;
270-
-M|-m)
270+
-m)
271271
do_merge=t
272272
;;
273273
-X)

0 commit comments

Comments
 (0)