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>
Ariadne Conill committed
Jul 15, 2019 at 07:41 UTC
2d9c56905804baa76069e2176035aebd62ddff15
2 files changed
+3
-2
Documentation/config/log.txt
+2
-1
@@ -40,4 +40,5 @@ log.showSignature::
40
41
log.mailmap::
42
If true, makes linkgit:git-log[1], linkgit:git-show[1], and
43
- linkgit:git-whatchanged[1] assume `--use-mailmap`.
43
+ linkgit:git-whatchanged[1] assume `--use-mailmap`, otherwise
44
+ assume `--no-use-mailmap`. False by default.
Documentation/git-log.txt
+1
-1
@@ -49,7 +49,7 @@ OPTIONS
49
Print out the ref name given on the command line by which each
50
commit was reached.
51
52
---use-mailmap::
52
+--[no-]use-mailmap::
53
Use mailmap file to map author and committer names and email
54
addresses to canonical real names and email addresses. See
55
linkgit:git-shortlog[1].