mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'mm/am-c-doc' into maint
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:
commit
d86679fa06
|
@ -1739,6 +1739,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
|
||||
|
|
|
@ -52,7 +52,8 @@ OPTIONS
|
|||
-c::
|
||||
--scissors::
|
||||
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::
|
||||
Ignore scissors lines (see linkgit:git-mailinfo[1]).
|
||||
|
|
Loading…
Reference in a new issue