diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-10-27 08:23:16 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-10-29 10:17:02 +0900 |
| commit | 55e51cd7412fd4564b295a5db1c8b6ad62afd89e (patch) | |
| tree | e5a42dd627487f12e0bf7aa6046d644f2c44632b /Documentation | |
| parent | config.txt: move log.* to a separate file (diff) | |
| download | tgif-55e51cd7412fd4564b295a5db1c8b6ad62afd89e.tar.xz | |
config.txt: move mailinfo.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 7 | ||||
| -rw-r--r-- | Documentation/config/mailinfo.txt | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index cce89ea50c..585d55d03d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -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 diff --git a/Documentation/config/mailinfo.txt b/Documentation/config/mailinfo.txt new file mode 100644 index 0000000000..3854d4ae37 --- /dev/null +++ b/Documentation/config/mailinfo.txt @@ -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 "-"). |