diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:22:50 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:22:50 -0700 |
commit | 588c038ac690e012a00dcace34fb318449f5ec7c (patch) | |
tree | d604d58fdb9d655e784d30b28b157e01eb289621 /builtin-mailsplit.c | |
parent | Merge branch 'rs/archive' (diff) | |
parent | Make usage strings dash-less (diff) | |
download | tgif-588c038ac690e012a00dcace34fb318449f5ec7c.tar.xz |
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-mailsplit.c')
-rw-r--r-- | builtin-mailsplit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-mailsplit.c b/builtin-mailsplit.c index e8cbe678ec..13c60c39a4 100644 --- a/builtin-mailsplit.c +++ b/builtin-mailsplit.c @@ -9,7 +9,7 @@ #include "path-list.h" static const char git_mailsplit_usage[] = -"git-mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> [<mbox>|<Maildir>...]"; +"git mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> [<mbox>|<Maildir>...]"; static int is_from_line(const char *line, int len) { |