summaryrefslogtreecommitdiff
path: root/builtin/mailsplit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-21 16:26:42 -0700
committerJunio C Hamano <gitster@pobox.com>2010-10-21 16:26:42 -0700
commitf7bff60de95951d2c82601350cb3771b347e83ee (patch)
tree5c0e747a86d4990b4e5b7176cec670de620dabe8 /builtin/mailsplit.c
parent75a2f301676aefb85c4f67da613cad2405e77927 (diff)
parentd0bb13663000be47d83cbe53b6c4bdc8835625cb (diff)
downloadgit-f7bff60de95951d2c82601350cb3771b347e83ee.tar.gz
Merge branch 'sn/doc-opt-notation' into maint
* sn/doc-opt-notation: Fix {update,checkout}-index usage strings Put a space between `<' and argument in pack-objects usage string Remove stray quotes in --pretty and --format documentation Use parentheses and `...' where appropriate Fix odd markup in --diff-filter documentation Use angles for placeholders consistently
Diffstat (limited to 'builtin/mailsplit.c')
-rw-r--r--builtin/mailsplit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
index 99654d0222..2d4327801e 100644
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@ -10,7 +10,7 @@
#include "strbuf.h"
static const char git_mailsplit_usage[] =
-"git mailsplit [-d<prec>] [-f<n>] [-b] [--keep-cr] -o<directory> [<mbox>|<Maildir>...]";
+"git mailsplit [-d<prec>] [-f<n>] [-b] [--keep-cr] -o<directory> [(<mbox>|<Maildir>)...]";
static int is_from_line(const char *line, int len)
{