X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fconfig.txt;h=f5152c5038b49ab5ebe3804e8e9b314d4a752690;hb=1e7ef0253c91bf2f25f9d8e44795b642737e664e;hp=1806a606100095fa1238076efed57ba7e79142aa;hpb=2a8644c7f163e4b76a36739ba936f8d5d91c3cf4;p=git.git

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 1806a6061..f5152c503 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1019,6 +1019,14 @@ log.showroot::
 	Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which
 	normally hide the root commit will now show it. True by default.
 
+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].
+
 man.viewer::
 	Specify the programs that may be used to display help in the
 	'man' format. See linkgit:git-help[1].