summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-10-27 06:23:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-29 01:17:02 (GMT)
commit55e51cd7412fd4564b295a5db1c8b6ad62afd89e (patch)
treee5a42dd627487f12e0bf7aa6046d644f2c44632b /Documentation/config.txt
parent8300976295da6cd0a5e416891e87b6694dfa7ac0 (diff)
downloadgit-55e51cd7412fd4564b295a5db1c8b6ad62afd89e.zip
git-55e51cd7412fd4564b295a5db1c8b6ad62afd89e.tar.gz
git-55e51cd7412fd4564b295a5db1c8b6ad62afd89e.tar.bz2
config.txt: move mailinfo.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt7
1 files changed, 1 insertions, 6 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index cce89ea..585d55d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -365,12 +365,7 @@ include::config/interactive.txt[]
include::config/log.txt[]
-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 "-").
+include::config/mailinfo.txt[]
mailmap.file::
The location of an augmenting mailmap file. The default