From: Stefan-W. Hahn Date: Sat, 27 Feb 2010 14:20:25 GMT Subject: [PATCH 1/4] git-mailsplit: Show parameter '--keep-cr' in usage and documentation Message-ID: <1267280428-18223-2-git-send-email-stefan.hahn@s-hahn.de> In-Reply-To: <1266080362-24760-1-git-send-email-stefan.hahn@s-hahn.de> Signed-off-by: Stefan-W. Hahn --- Documentation/git-mailsplit.txt | 5 ++++- builtin-mailsplit.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt index 5cc94ec..a634485 100644 --- a/Documentation/git-mailsplit.txt +++ b/Documentation/git-mailsplit.txt @@ -7,7 +7,7 @@ git-mailsplit - Simple UNIX mbox splitter program SYNOPSIS -------- -'git mailsplit' [-b] [-f] [-d] -o [--] [|...] +'git mailsplit' [-b] [-f] [-d] [--keep-cr] -o [--] [|...] DESCRIPTION ----------- @@ -43,6 +43,9 @@ OPTIONS Skip the first numbers, for example if -f3 is specified, start the numbering with 0004. +--keep-cr:: + Do not remove `\r` from lines ending with `\r\n`. + Author ------ Written by Linus Torvalds 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] [-f] [-b] -o [|...]"; +"git mailsplit [-d] [-f] [-b] [--keep-cr] -o [|...]"; static int is_from_line(const char *line, int len) { -- 1.7.0.98.g42448