git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v3 1/2] Documentation/config.txt: document mailinfo.scissors
Date: Fri, 20 Feb 2015 20:32:20 +0100	[thread overview]
Message-ID: <1424460741-25533-1-git-send-email-Matthieu.Moy@imag.fr> (raw)
In-Reply-To: <1424426947-26441-1-git-send-email-Matthieu.Moy@imag.fr>

The variable was documented in git-mailinfo.txt, but not in config.txt.
The detailed documentation is still the one of --scissors in
git-mailinfo.txt, but we give enough information here to let the user
understand what it is about, and to make it easy to find it (e.g.
searching ">8" and "8<" finds it).

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
Hopefully, I'd have fixed all intances of my typo now :-\.

Sorry for the noise.

 Documentation/config.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index ae6791d..15f8695 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1740,6 +1740,13 @@ log.mailmap::
 	If true, makes linkgit:git-log[1], linkgit:git-show[1], and
 	linkgit:git-whatchanged[1] assume `--use-mailmap`.
 
+mailinfo.scissors::
+	If true, makes linkgit:git-mailinfo[1] (and therefore
+	linkgit:git-am[1]) act by default as if the --scissors option
+	was provided on the command-line. When active, this features
+	removes everything from the message body before a scissors
+	line (i.e. consisting mainly of ">8", "8<" and "-").
+
 mailmap.file::
 	The location of an augmenting mailmap file. The default
 	mailmap, located in the root of the repository, is loaded
-- 
2.3.0.157.g79e124b

  parent reply	other threads:[~2015-02-20 19:32 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   ` [PATCH v2 2/2] Documentation/git-am.txt: mention mailinfo.scissors config variable Matthieu Moy
2015-02-20 17:11   ` [PATCH v2 1/2] Documentation/config.txt: document mailinfo.scissor Eric Sunshine
2015-02-20 19:32 ` Matthieu Moy [this message]
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=1424460741-25533-1-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).