Documentation/config.txt: document mailinfo.scissors
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Feb 20, 2015 at 20:32 UTC
d5c4b1855dd20ee59aac851a201244280482e14d
1 file changed
+7
Documentation/config.txt
+7
@@ -1699,6 +1699,13 @@ log.mailmap::
1699
If true, makes linkgit:git-log[1], linkgit:git-show[1], and
1700
linkgit:git-whatchanged[1] assume `--use-mailmap`.
1701
1702
+mailinfo.scissors::
1703
+ If true, makes linkgit:git-mailinfo[1] (and therefore
1704
+ linkgit:git-am[1]) act by default as if the --scissors option
1705
+ was provided on the command-line. When active, this features
1706
+ removes everything from the message body before a scissors
1707
+ line (i.e. consisting mainly of ">8", "8<" and "-").
1708
+
1709
mailmap.file::
1710
The location of an augmenting mailmap file. The default
1711
mailmap, located in the root of the repository, is loaded