From: "Stefan-W. Hahn" <stefan.hahn@s-hahn.de>
To: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Cc: "Stefan-W. Hahn" <stefan.hahn@s-hahn.de>
Subject: [PATCH 1/4] git-mailsplit: Show parameter '--keep-cr' in usage and documentation
Date: Sat, 27 Feb 2010 15:20:25 +0100 [thread overview]
Message-ID: <1267280428-18223-2-git-send-email-stefan.hahn@s-hahn.de> (raw)
In-Reply-To: <1266080362-24760-1-git-send-email-stefan.hahn@s-hahn.de>
Signed-off-by: Stefan-W. Hahn <stefan.hahn@s-hahn.de>
---
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<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 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<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)
{
--
1.7.0.98.g42448
next prev parent reply other threads:[~2010-02-27 14:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-13 17:09 [PATCHv3 0/3] Using git-mailsplit in mixed line ending environment Stefan-W. Hahn
2010-02-13 16:59 ` [PATCH 1/3] git-mailsplit: Show parameter '--keep-cr' in usage and documentation Stefan-W. Hahn
2010-02-13 16:59 ` [PATCH 2/3] git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit Stefan-W. Hahn
2010-02-13 16:59 ` [PATCH 3/3] Adding test for `--keep-cr` for git-am Stefan-W. Hahn
2010-02-13 17:11 ` [PATCH 1/3] git-mailsplit: Show parameter '--keep-cr' in usage and documentation Stefan-W. Hahn
2010-02-13 17:11 ` [PATCH 2/3] git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit Stefan-W. Hahn
2010-02-22 21:10 ` Junio C Hamano
2010-02-13 17:11 ` [PATCH 3/3] Adding test for `--keep-cr` for git-am Stefan-W. Hahn
2010-02-22 21:25 ` Junio C Hamano
2010-02-27 14:20 ` [PATCHv4 0/4] Using git-mailsplit in mixed line ending environment Stefan-W. Hahn
2010-02-28 21:18 ` Junio C Hamano
2010-02-27 14:20 ` Stefan-W. Hahn [this message]
2010-02-27 14:20 ` [PATCH 2/4] git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit Stefan-W. Hahn
2010-02-27 14:20 ` [PATCH 3/4] git-am: Add configuration am.keepcr and parameter --no-keep-cr to override configuration Stefan-W. Hahn
2010-02-27 14:20 ` [PATCH 4/4] git-am: Adding tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr` Stefan-W. Hahn
-- strict thread matches above, loose matches on Subject: below --
2010-02-11 21:26 [PATCHv2 0/4] Using git-mailsplit in mixed line ending environment Stefan-W. Hahn
2010-02-11 21:26 ` [PATCH 1/4] git-mailsplit: Show parameter '--keep-cr' in usage and documentation Stefan-W. Hahn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1267280428-18223-2-git-send-email-stefan.hahn@s-hahn.de \
--to=stefan.hahn@s-hahn.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).