summaryrefslogtreecommitdiff
path: root/builtin-shortlog.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-13 02:17:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-04-13 02:17:51 (GMT)
commitf43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f (patch)
treeb29df95a9ea15dc54263921f63077c62058d6c22 /builtin-shortlog.c
parenta53f2ec617ba36a67bf8794d28d666d45ce374a6 (diff)
parent02604e293a3b7d48b0ce4e34149de8dc89c674e5 (diff)
downloadgit-f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f.zip
git-f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f.tar.gz
git-f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f.tar.bz2
Merge branch 'maint'
* maint: t7401: squelch garbage output Documentation/git-submodule: typofix Fix config key miscount in url.*.insteadOf Docs gitk: Explicitly mention the files that gitk uses (~/.gitk) Document -w option to shortlog bisect: report bad rev better
Diffstat (limited to 'builtin-shortlog.c')
-rw-r--r--builtin-shortlog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index bd795b1..e6a2865 100644
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -9,7 +9,7 @@
#include "shortlog.h"
static const char shortlog_usage[] =
-"git-shortlog [-n] [-s] [-e] [<commit-id>... ]";
+"git-shortlog [-n] [-s] [-e] [-w] [<commit-id>... ]";
static int compare_by_number(const void *a1, const void *a2)
{