From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [PATCH v2 2/2] Documentation/git-am.txt: mention mailinfo.scissors config variable
Date: Fri, 20 Feb 2015 11:29:03 +0100 [thread overview]
Message-ID: <1424428143-641-2-git-send-email-Matthieu.Moy@imag.fr> (raw)
In-Reply-To: <1424428143-641-1-git-send-email-Matthieu.Moy@imag.fr>
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>
---
Documentation/git-am.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index f4eea28..0d8ba48 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]).
--
2.3.0.157.g79e124b
next prev parent reply other threads:[~2015-02-20 10:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-20 10:09 [PATCH 1/2] Documentation/config.txt: document mailinfo.scissor Matthieu Moy
2015-02-20 10:09 ` [PATCH 2/2] Documentation/git-am.txt: mention mailinfo.scissor config variable Matthieu Moy
2015-02-20 10:19 ` Jeff King
2015-02-20 10:17 ` [PATCH 1/2] Documentation/config.txt: document mailinfo.scissor Jeff King
2015-02-20 10:29 ` [PATCH v2 " Matthieu Moy
2015-02-20 10:29 ` Matthieu Moy [this message]
2015-02-20 17:11 ` Eric Sunshine
2015-02-20 19:32 ` [PATCH v3 1/2] Documentation/config.txt: document mailinfo.scissors Matthieu Moy
2015-02-20 19:32 ` [PATCH v3 2/2] Documentation/git-am.txt: mention mailinfo.scissors config variable Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1424428143-641-2-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).