diff options
| author | Stefan-W. Hahn <stefan.hahn@s-hahn.de> | 2010-02-27 15:20:25 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-28 11:04:19 -0800 |
| commit | abeb09b646921b725561870ef4dd62294f9863ad (patch) | |
| tree | d231d273907219178ed3da8e2b02ef6af72327f4 | |
| parent | f7311dc2293d9c52827c518933c80bd664023e97 (diff) | |
| download | git-abeb09b646921b725561870ef4dd62294f9863ad.tar.gz git-abeb09b646921b725561870ef4dd62294f9863ad.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-mailsplit.txt | 5 | ||||
| -rw-r--r-- | builtin-mailsplit.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt index 5cc94ec53..a63448528 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<nn>] [-d<prec>] -o<directory> [--] [<mbox>|<Maildir>...] +'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] -o<directory> [--] [<mbox>|<Maildir>...] DESCRIPTION ----------- @@ -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 <torvalds@osdl.org> diff --git a/builtin-mailsplit.c b/builtin-mailsplit.c index 207e358ed..cdfc1b704 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) { |