summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-10 23:32:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-10 23:32:34 (GMT)
commitc505a850157961d2db4512d029753946d0591649 (patch)
tree718529011f6b516554933451fad147341c3c3ca6 /Documentation/git-am.txt
parente25ccff14071ec3628153992acc82b9922e16938 (diff)
parent6d8d8e0de3ca753cd482012d3695602e36356145 (diff)
downloadgit-c505a850157961d2db4512d029753946d0591649.zip
git-c505a850157961d2db4512d029753946d0591649.tar.gz
git-c505a850157961d2db4512d029753946d0591649.tar.bz2
Merge branch 'sh/am-keep-cr'
* sh/am-keep-cr: git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr` git-am: Add am.keepcr and --no-keep-cr to override it git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit documentation: 'git-mailsplit --keep-cr' is not hidden anymore
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 23864df..9e62f87 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 | --no-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,13 @@ OPTIONS
--keep::
Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
+--keep-cr::
+--no-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. `am.keepcr` configuration variable can be used to specify the
+ default behaviour. `--no-keep-cr` is useful to override `am.keepcr`.
+
-c::
--scissors::
Remove everything in body before a scissors line (see