summaryrefslogtreecommitdiff
path: root/builtin/mailsplit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-10 23:32:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-10 23:32:34 (GMT)
commitc505a850157961d2db4512d029753946d0591649 (patch)
tree718529011f6b516554933451fad147341c3c3ca6 /builtin/mailsplit.c
parente25ccff14071ec3628153992acc82b9922e16938 (diff)
parent6d8d8e0de3ca753cd482012d3695602e36356145 (diff)
downloadgit-c505a850157961d2db4512d029753946d0591649.zip
git-c505a850157961d2db4512d029753946d0591649.tar.gz
git-c505a850157961d2db4512d029753946d0591649.tar.bz2
Merge branch 'sh/am-keep-cr'
* sh/am-keep-cr: git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr` git-am: Add am.keepcr and --no-keep-cr to override it git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit documentation: 'git-mailsplit --keep-cr' is not hidden anymore
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 207e358..cdfc1b7 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] -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)
{