Teach 'git merge' that some merge strategies no longer exist

diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index f8bcbfce4009337c4aea0b923a620fc4697e4df3..94c4723856924a9643bcaf6c14fd9679667cbbdd 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -10,7 +10,7 @@
 #include "parse-options.h"
 
 static char const * const shortlog_usage[] = {
-       "git-shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]",
+       "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]",
        "",
        "[rev-opts] are documented in git-rev-list(1)",
        NULL