summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorStefan-W. Hahn <stefan.hahn@s-hahn.de>2010-02-27 14:20:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-28 19:07:49 (GMT)
commite80d4cbefce106506ec217f9ab279bcf0b84a2e9 (patch)
tree6eeb6b7f8c3478e0e7a9843501f4964dbeddd5e6 /Documentation/git-am.txt
parentad2c928001d2d94f2cbf3c75734061eb8fc4383c (diff)
downloadgit-e80d4cbefce106506ec217f9ab279bcf0b84a2e9.zip
git-e80d4cbefce106506ec217f9ab279bcf0b84a2e9.tar.gz
git-e80d4cbefce106506ec217f9ab279bcf0b84a2e9.tar.bz2
git-am: Add am.keepcr and --no-keep-cr to override it
This patch adds the configuration `am.keepcr` for git-am. It also adds `--no-keep-cr` parameter for git-am to give the possibility to override configuration from command line. 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.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index eefdc4b..70bc698 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] [--keep-cr] [--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>]
@@ -40,9 +40,11 @@ OPTIONS
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.
+ lines. `am.keepcr` configuration variable can be used to specify the
+ default behaviour. `--no-keep-cr` is useful to override `am.keepcr`.
-c::
--scissors::