Skip to content

Commit d5c4b18

Browse files
moygitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 282616c commit d5c4b18

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

Documentation/config.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1699,6 +1699,13 @@ log.mailmap::
16991699
If true, makes linkgit:git-log[1], linkgit:git-show[1], and
17001700
linkgit:git-whatchanged[1] assume `--use-mailmap`.
17011701

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+
17021709
mailmap.file::
17031710
The location of an augmenting mailmap file. The default
17041711
mailmap, located in the root of the repository, is loaded

0 commit comments

Comments
 (0)