config.txt: move mailmap.* 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>
Nguyễn Thái Ngọc Duy committed
Oct 27, 2018 at 08:23 UTC
4a9f0c52cfa4e36d1e1037cb056e377c52189681
2 files changed
+16
-15
Documentation/config.txt
+1
-15
@@ -367,21 +367,7 @@ include::config/log.txt[]
367
368
include::config/mailinfo.txt[]
369
370
-mailmap.file::
371
- The location of an augmenting mailmap file. The default
372
- mailmap, located in the root of the repository, is loaded
373
- first, then the mailmap file pointed to by this variable.
374
- The location of the mailmap file may be in a repository
375
- subdirectory, or somewhere outside of the repository itself.
376
- See linkgit:git-shortlog[1] and linkgit:git-blame[1].
377
-
378
-mailmap.blob::
379
- Like `mailmap.file`, but consider the value as a reference to a
380
- blob in the repository. If both `mailmap.file` and
381
- `mailmap.blob` are given, both are parsed, with entries from
382
- `mailmap.file` taking precedence. In a bare repository, this
383
- defaults to `HEAD:.mailmap`. In a non-bare repository, it
384
- defaults to empty.
370
+include::config/mailmap.txt[]
371
372
man.viewer::
373
Specify the programs that may be used to display help in the
Documentation/config/mailmap.txt
new
+15
@@ -0,0 +1,15 @@
1
+mailmap.file::
2
+ The location of an augmenting mailmap file. The default
3
+ mailmap, located in the root of the repository, is loaded
4
+ first, then the mailmap file pointed to by this variable.
5
+ The location of the mailmap file may be in a repository
6
+ subdirectory, or somewhere outside of the repository itself.
7
+ See linkgit:git-shortlog[1] and linkgit:git-blame[1].
8
+
9
+mailmap.blob::
10
+ Like `mailmap.file`, but consider the value as a reference to a
11
+ blob in the repository. If both `mailmap.file` and
12
+ `mailmap.blob` are given, both are parsed, with entries from
13
+ `mailmap.file` taking precedence. In a bare repository, this
14
+ defaults to `HEAD:.mailmap`. In a non-bare repository, it
15
+ defaults to empty.