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@xxxxxxxxxxxxxxxx> --- git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase.sh b/git-rebase.sh index 6b9279a69028..2f2f8ded5c3f 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -259,7 +259,7 @@ do --no-autosquash) autosquash= ;; - -M|-m) + -m) do_merge=t ;; -X) -- 1.8.4.2 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html