Merge branch 'cc/multi-promisor'

diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
index 7798e10cb0ac5e4360ad50eae0a8a5a852a8f271..e9e1e397f3fd154511931f8c88e66c728b3cc07a 100644 (file)
--- a/Documentation/config/log.txt
+++ b/Documentation/config/log.txt
@@ -41,4 +41,4 @@ log.showSignature::
 log.mailmap::
        If true, makes linkgit:git-log[1], linkgit:git-show[1], and
        linkgit:git-whatchanged[1] assume `--use-mailmap`, otherwise
-       assume `--no-use-mailmap`. False by default.
+       assume `--no-use-mailmap`. True by default.