Skip to content

Commit abeb09b

Browse files
Stefan-W. Hahngitster
authored andcommitted
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>
1 parent f7311dc commit abeb09b

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Documentation/git-mailsplit.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ git-mailsplit - Simple UNIX mbox splitter program
77

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

1212
DESCRIPTION
1313
-----------
@@ -43,6 +43,9 @@ OPTIONS
4343
Skip the first <nn> numbers, for example if -f3 is specified,
4444
start the numbering with 0004.
4545

46+
--keep-cr::
47+
Do not remove `\r` from lines ending with `\r\n`.
48+
4649
Author
4750
------
4851
Written by Linus Torvalds <torvalds@osdl.org>

builtin-mailsplit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "strbuf.h"
1111

1212
static const char git_mailsplit_usage[] =
13-
"git mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> [<mbox>|<Maildir>...]";
13+
"git mailsplit [-d<prec>] [-f<n>] [-b] [--keep-cr] -o<directory> [<mbox>|<Maildir>...]";
1414

1515
static int is_from_line(const char *line, int len)
1616
{

0 commit comments

Comments
 (0)