diff options
| author |  Ariadne Conill <ariadne@dereferenced.org> | 2019-07-15 07:41:05 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-07-15 11:44:26 -0700 |
| commit | 2d9c56905804baa76069e2176035aebd62ddff15 (patch) | |
| tree | c0f7671d9056792b1cd97efcf26b58ac2b421f44 /Documentation | |
| parent | log: add warning for unspecified log.mailmap setting (diff) | |
| download | tgif-2d9c56905804baa76069e2176035aebd62ddff15.tar.xz | |
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')
| -rw-r--r-- | Documentation/config/log.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-log.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index 78d9e4453a..7798e10cb0 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. diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index b02e922dc3..b406bc4c48 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -49,7 +49,7 @@ OPTIONS Print out the ref name given on the command line by which each commit was reached. ---use-mailmap:: +--[no-]use-mailmap:: Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]. |