undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: don't try to match -M option

Browse Source 
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>
This commit is contained in:
Nicolas Vigier 2014-02-01 02:18:03 +00:00 committed by Junio C Hamano
parent 2f9dc1fb52
commit e4a4e7f27a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase.sh
View File

@ -267,7 +267,7 @@ do
--no-fork-point)
fork_point=
;;
-M|-m)
-m)
do_merge=t
;;
-X)