From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Mar 2015 20:45:40 +0000 (-0800)
Subject: Merge branch 'mm/am-c-doc'
X-Git-Tag: v2.4.0-rc0~72
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fec7b79aa469eec2fa184b1ff7f8e41fb6fa632c?hp=fd9de868c359a1bbd214e354aefdb0f1eaa898bd

Merge branch 'mm/am-c-doc'

The configuration variable 'mailinfo.scissors' was hard to
discover in the documentation.

* mm/am-c-doc:
Documentation/git-am.txt: mention mailinfo.scissors config variable
Documentation/config.txt: document mailinfo.scissors
---

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 440784cbdd..3babf4af13 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1739,6 +1739,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
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index f4eea28dc4..0d8ba48f79 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]).