| commit | ad2c928001d2d94f2cbf3c75734061eb8fc4383c | |
| author | Stefan-W. Hahn <stefan.hahn@s-hahn.de> | |
| Sat, 27 Feb 2010 14:20:26 +0000 (27 15:20 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 28 Feb 2010 19:06:10 +0000 (28 11:06 -0800) | ||
| tree | 24652828b45347a5d1e40ee11f582d1e4e625311 | treesnapshot (tar.gz zip) |
| parent | abeb09b646921b725561870ef4dd62294f9863ad | commitdiff |
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>
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>
| Documentation/git-am.txt | diffblobblamehistory | |
| git-am.sh | diffblobblamehistory |