summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2015-02-20 20:32:21 +0100
committerJunio C Hamano <gitster@pobox.com>2015-02-20 15:09:23 -0800
commitafb5de7f8d0dd9207a587f4ee2fa29d7ee8485ea (patch)
treea031e6f766d379138553eb6f11798906112b5cea
parentd5c4b1855dd20ee59aac851a201244280482e14d (diff)
downloadgit-mm/am-c-doc.tar.gz
Documentation/git-am.txt: mention mailinfo.scissors config variablemm/am-c-doc
It was already documented, but the user had to follow the link to git-mailinfo.txt to find it. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-am.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 9adce372ec..672a8d3834 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -52,7 +52,8 @@ OPTIONS
-c::
--scissors::
Remove everything in body before a scissors line (see
- linkgit:git-mailinfo[1]).
+ linkgit:git-mailinfo[1]). Can be activated by default using
+ the `mailinfo.scissors` configuration variable.
--no-scissors::
Ignore scissors lines (see linkgit:git-mailinfo[1]).