From: brian m. carlson Date: Sat, 01 Feb 2014 02:18:03 GMT Subject: [PATCH v3 6/9] rebase: don't try to match -M option Message-ID: <1391221086-1044384-7-git-send-email-sandals@crustytoothpaste.net> In-Reply-To: <1391221086-1044384-1-git-send-email-sandals@crustytoothpaste.net> From: Nicolas Vigier The -M option does not exist in OPTIONS_SPEC, so there is no use to try to find it. Signed-off-by: Nicolas Vigier Signed-off-by: brian m. carlson --- git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase.sh b/git-rebase.sh index d1835ba..3b55211 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) -- 1.9.rc1.1006.g13f506b.dirty