diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-07-17 04:22:50 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-07-17 04:22:50 +0400 |
commit | 588c038ac690e012a00dcace34fb318449f5ec7c (patch) | |
tree | d604d58fdb9d655e784d30b28b157e01eb289621 /builtin-symbolic-ref.c | |
parent | e75bf76f5462af4185d8260f6feecf24dd24a516 (diff) | |
parent | 1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d (diff) |
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-symbolic-ref.c')
-rw-r--r-- | builtin-symbolic-ref.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-symbolic-ref.c b/builtin-symbolic-ref.c index b49bdb6900..bfc78bb3f6 100644 --- a/builtin-symbolic-ref.c +++ b/builtin-symbolic-ref.c @@ -4,7 +4,7 @@ #include "parse-options.h" static const char * const git_symbolic_ref_usage[] = { - "git-symbolic-ref [options] name [ref]", + "git symbolic-ref [options] name [ref]", NULL }; |