Skip to content

Commit

Permalink
config.txt: move mailinfo.* to a separate file
Browse files Browse the repository at this point in the history
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
pclouds authored and gitster committed Oct 29, 2018
1 parent 8300976 commit 55e51cd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
7 changes: 1 addition & 6 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -365,12 +365,7 @@ include::config/interactive.txt[]

include::config/log.txt[]

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 "-").
include::config/mailinfo.txt[]

mailmap.file::
The location of an augmenting mailmap file. The default
Expand Down
6 changes: 6 additions & 0 deletions Documentation/config/mailinfo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
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 "-").

0 comments on commit 55e51cd

Please sign in to comment.