summaryrefslogtreecommitdiff
path: root/Documentation/config/log.txt
diff options
context:
space:
mode:
authorAriadne Conill <ariadne@dereferenced.org>2019-07-15 12:41:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-15 18:44:26 (GMT)
commit2d9c56905804baa76069e2176035aebd62ddff15 (patch)
treec0f7671d9056792b1cd97efcf26b58ac2b421f44 /Documentation/config/log.txt
parentf0596ecc8de9bdbdfc394b2f153ff67f64fc4615 (diff)
downloadgit-2d9c56905804baa76069e2176035aebd62ddff15.zip
git-2d9c56905804baa76069e2176035aebd62ddff15.tar.gz
git-2d9c56905804baa76069e2176035aebd62ddff15.tar.bz2
documentation: mention --no-use-mailmap and log.mailmap false setting
The log.mailmap setting may be explicitly set to false, which disables the mailmap feature implicity. In practice, doing so is equivalent to always using the previously undocumented --no-use-mailmap option on the command line. Accordingly, we document both the existence of --no-use-mailmap as well as briefly discuss the equivalence of it to log.mailmap=False. Signed-off-by: Ariadne Conill <ariadne@dereferenced.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/log.txt')
-rw-r--r--Documentation/config/log.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
index 78d9e44..7798e10 100644
--- a/Documentation/config/log.txt
+++ b/Documentation/config/log.txt
@@ -40,4 +40,5 @@ log.showSignature::
log.mailmap::
If true, makes linkgit:git-log[1], linkgit:git-show[1], and
- linkgit:git-whatchanged[1] assume `--use-mailmap`.
+ linkgit:git-whatchanged[1] assume `--use-mailmap`, otherwise
+ assume `--no-use-mailmap`. False by default.