Skip to content

Commit

Permalink
rebase: don't try to match -M option
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nicolas Vigier authored and Junio C Hamano committed Feb 3, 2014
1 parent 2f9dc1f commit e4a4e7f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ do
--no-fork-point)
fork_point=
;;
-M|-m)
-m)
do_merge=t
;;
-X)
Expand Down

0 comments on commit e4a4e7f

Please sign in to comment.