Merge branch 'jc/strbuf-branchname-fix'

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 240bff3efa80b3af087fe1e6c16a75108ffee4de..1fd6f8ac5977ee670bf8ba230cec8553393baafd 100644 (file)
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -10,9 +10,7 @@
 #include "parse-options.h"
 
 static char const * const shortlog_usage[] = {
-       N_("git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"),
-       "",
-       N_("[rev-opts] are documented in git-rev-list(1)"),
+       N_("git shortlog [<options>] [<revision range>] [[--] [<path>...]]"),
        NULL
 };