summaryrefslogtreecommitdiff
path: root/builtin-shortlog.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-12 15:41:19 -0700
committerJunio C Hamano <gitster@pobox.com>2008-04-12 15:41:19 -0700
commitd6d96f835cace1c108100cf88e216a59debcb937 (patch)
treef5d347de6193849ad4cec2b52d35e225d9c1e9e9 /builtin-shortlog.c
parenteed81838f0d0e031702473e1d427d71055134edd (diff)
parente80950786c16e642be76976a8926b2846ba0aa4f (diff)
downloadgit-d6d96f835cace1c108100cf88e216a59debcb937.tar.gz
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4: 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 bd795b1db7..e6a2865019 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)
{