diff options
| author | Stefan-W. Hahn <stefan.hahn@s-hahn.de> | 2010-02-27 15:20:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-28 11:06:10 -0800 |
| commit | ad2c928001d2d94f2cbf3c75734061eb8fc4383c (patch) | |
| tree | 24652828b45347a5d1e40ee11f582d1e4e625311 /Documentation/git-am.txt | |
| parent | abeb09b646921b725561870ef4dd62294f9863ad (diff) | |
| download | git-ad2c928001d2d94f2cbf3c75734061eb8fc4383c.tar.gz git-ad2c928001d2d94f2cbf3c75734061eb8fc4383c.tar.xz | |
git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit
c2ca1d7 (Allow mailsplit (and hence git-am) to handle mails with CRLF
line-endings, 2009-08-04) fixed "git mailsplit" to help people with
MUA whose output from save-as command uses CRLF as line terminators by
stripping CR at the end of lines.
However, when you know you are feeding output from "git format-patch"
directly to "git am", and especially when your contents have CR at the
end of line, such stripping is undesirable. To help such a use case,
teach --keep-cr option to "git am" and pass that to "git mailinfo".
Signed-off-by: Stefan-W. Hahn <stefan.hahn@s-hahn.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index c66c565bb..eefdc4b9d 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -9,7 +9,7 @@ git-am - Apply a series of patches from a mailbox SYNOPSIS -------- [verse] -'git am' [--signoff] [--keep] [--utf8 | --no-utf8] +'git am' [--signoff] [--keep] [--keep-cr] [--utf8 | --no-utf8] [--3way] [--interactive] [--committer-date-is-author-date] [--ignore-date] [--ignore-space-change | --ignore-whitespace] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] @@ -39,6 +39,11 @@ OPTIONS --keep:: Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). +--keep-cr:: + With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) + with the same option, to prevent it from stripping CR at the end of + lines. + -c:: --scissors:: Remove everything in body before a scissors line (see |