summaryrefslogtreecommitdiff
path: root/builtin-shortlog.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-16 17:22:50 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-16 17:22:50 -0700
commit588c038ac690e012a00dcace34fb318449f5ec7c (patch)
treed604d58fdb9d655e784d30b28b157e01eb289621 /builtin-shortlog.c
parente75bf76f5462af4185d8260f6feecf24dd24a516 (diff)
parent1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d (diff)
downloadgit-588c038ac690e012a00dcace34fb318449f5ec7c.tar.gz
Merge branch 'sb/dashless'
* sb/dashless: Make usage strings dash-less t/: Use "test_must_fail git" instead of "! git" t/test-lib.sh: exit with small negagive int is ok with test_must_fail Conflicts: builtin-blame.c builtin-mailinfo.c builtin-mailsplit.c builtin-shortlog.c git-am.sh t/t4150-am.sh t/t4200-rerere.sh
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 f8bcbfce40..94c4723856 100644
--- 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