From: Matthieu Moy Date: Fri, 20 Feb 2015 19:32:20 +0000 (+0100) Subject: Documentation/config.txt: document mailinfo.scissors X-Git-Tag: v2.3.2~3^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d5c4b1855dd20ee59aac851a201244280482e14d 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index 0c32597639..7485476a1e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1699,6 +1699,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