summaryrefslogtreecommitdiffstats
path: root/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-05 14:38:26 -0800
committerJunio C Hamano <gitster@pobox.com>2015-03-05 14:38:26 -0800
commit7f1bc9d8e78bb4cbc0ffa8461bc4171686e22fa2 (patch)
tree6aa0cb479d5d28d3f9749653f2329eb20b350d01 /config.txt
parent22b7549f5378e280118862e7618171c14db05d88 (diff)
downloadgit-htmldocs-7f1bc9d8e78bb4cbc0ffa8461bc4171686e22fa2.tar.gz
Autogenerated HTML docs for v2.3.1-251-g83036
Diffstat (limited to 'config.txt')
-rw-r--r--config.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/config.txt b/config.txt
index 440784cbd..3babf4af1 100644
--- a/config.txt
+++ b/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