diff options
author | Nicolas Vigier <boklm@mars-attacks.org> | 2014-02-01 02:18:03 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-02-03 12:13:55 -0800 |
commit | e4a4e7f27ad5d7a8534608b9a4d2d19ee6238925 (patch) | |
tree | 0cf5b6e9a47bbb47d14471f89b0515e053540508 /git-rebase.sh | |
parent | 2f9dc1fb529662e157c53c7d91e5f75e0f72c6ea (diff) | |
download | git-e4a4e7f27ad5d7a8534608b9a4d2d19ee6238925.tar.gz |
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>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index d1835ba58a..3b55211081 100755 --- 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) |