Skip to content

Commit

Permalink
documentation: 'git-mailsplit --keep-cr' is not hidden anymore
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
Stefan-W. Hahn authored and gitster committed Feb 28, 2010
1 parent f7311dc commit abeb09b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion Documentation/git-mailsplit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ git-mailsplit - Simple UNIX mbox splitter program

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
-----------
Expand Down Expand Up @@ -43,6 +43,9 @@ OPTIONS
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 <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion builtin-mailsplit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit abeb09b

Please sign in to comment.