diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-10-27 08:23:17 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-29 10:17:03 +0900 |
| commit | 4a9f0c52cfa4e36d1e1037cb056e377c52189681 (patch) | |
| tree | cd55a1c6d6e97d4bf05772c95e69f95e476fd651 /Documentation/config | |
| parent | 55e51cd7412fd4564b295a5db1c8b6ad62afd89e (diff) | |
| download | git-4a9f0c52cfa4e36d1e1037cb056e377c52189681.tar.gz git-4a9f0c52cfa4e36d1e1037cb056e377c52189681.tar.xz | |
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>
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/mailmap.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/config/mailmap.txt b/Documentation/config/mailmap.txt new file mode 100644 index 000000000..48cbc3072 --- /dev/null +++ b/Documentation/config/mailmap.txt @@ -0,0 +1,15 @@ +mailmap.file:: + The location of an augmenting mailmap file. The default + mailmap, located in the root of the repository, is loaded + first, then the mailmap file pointed to by this variable. + The location of the mailmap file may be in a repository + subdirectory, or somewhere outside of the repository itself. + See linkgit:git-shortlog[1] and linkgit:git-blame[1]. + +mailmap.blob:: + Like `mailmap.file`, but consider the value as a reference to a + blob in the repository. If both `mailmap.file` and + `mailmap.blob` are given, both are parsed, with entries from + `mailmap.file` taking precedence. In a bare repository, this + defaults to `HEAD:.mailmap`. In a non-bare repository, it + defaults to empty. |