undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mm/am-c-doc'

Browse Source 
The configuration variable 'mailinfo.scissors' was hard to
discover in the documentation.

* mm/am-c-doc:
  Documentation/git-am.txt: mention mailinfo.scissors config variable
  Documentation/config.txt: document mailinfo.scissors
This commit is contained in:
Junio C Hamano 2015-03-05 12:45:40 -08:00
commit fec7b79aa4
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/config.txt
View File

@ -1739,6 +1739,13 @@ log.mailmap::
If true, makes linkgit:git-log[1], linkgit:git-show[1], and If true, makes linkgit:git-log[1], linkgit:git-show[1], and
linkgit:git-whatchanged[1] assume `--use-mailmap`. 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:: mailmap.file::
The location of an augmenting mailmap file. The default The location of an augmenting mailmap file. The default
mailmap, located in the root of the repository, is loaded mailmap, located in the root of the repository, is loaded

3
Documentation/git-am.txt
View File

@ -52,7 +52,8 @@ OPTIONS
-c:: -c::
--scissors:: --scissors::
Remove everything in body before a scissors line (see Remove everything in body before a scissors line (see
linkgit:git-mailinfo[1]). linkgit:git-mailinfo[1]). Can be activated by default using
the `mailinfo.scissors` configuration variable.
--no-scissors:: --no-scissors::
Ignore scissors lines (see linkgit:git-mailinfo[1]). Ignore scissors lines (see linkgit:git-mailinfo[1]).