log: add log.mailmap configuration option

diff --git a/Documentation/config.txt b/Documentation/config.txt
index bf8f911e1ffe7820a8e903ec669c690d39612150..226362a0ea48e389f66f55ae3c14031c9c1654cc 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1509,6 +1509,10 @@ 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.
 
+log.mailmap::
+       If true, makes linkgit:git-log[1], linkgit:git-show[1], and
+       linkgit:git-whatchanged[1] assume `--use-mailmap`.
+
 mailmap.file::
        The location of an augmenting mailmap file. The default
        mailmap, located in the root of the repository, is loaded