documentation: 'git-mailsplit --keep-cr' is not hidden anymore

So far this was an internal mechanism for rebase, but we will be exposing
it to the end users.

Signed-off-by: Stefan-W. Hahn <stefan.hahn@s-hahn.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt
index 5cc94ec53daf3057f57c993983d659543962abec..a634485281154cb665c8168cc3469dc0f5051697 100644 (file)
--- a/Documentation/git-mailsplit.txt
+++ b/Documentation/git-mailsplit.txt
@@ -7,7 +7,7 @@ git-mailsplit - Simple UNIX mbox splitter program
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git mailsplit' [-b] [-f<nn>] [-d<prec>] -o<directory> [--] [<mbox>|<Maildir>...]
+'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] -o<directory> [--] [<mbox>|<Maildir>...]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -43,6 +43,9 @@ OPTIONS
        Skip the first <nn> numbers, for example if -f3 is specified,
        start the numbering with 0004.
 
        Skip the first <nn> 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 <torvalds@osdl.org>
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>

diff --git a/builtin-mailsplit.c b/builtin-mailsplit.c
index 207e358ed19cecb8cf7b57d59a9149619909459d..cdfc1b70429dc5d47e42e7aabc9449a585623b0f 100644 (file)
--- a/builtin-mailsplit.c
+++ b/builtin-mailsplit.c
@@ -10,7 +10,7 @@
 #include "strbuf.h"
 
 static const char git_mailsplit_usage[] =
 #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)
 {
 
 static int is_from_line(const char *line, int len)
 {