[PATCH v4 2/3] log: document --no-use-mailmap option
- From
Ariadne Conill <ariadne@dereferenced.org>
- Date
- Jul 11, 2019, 18:37 UTC
- Message-ID
- <20190711183727.8058-3-ariadne@dereferenced.org>
- In-Reply-To
- <20190711183727.8058-1-ariadne@dereferenced.org>
When mailmap is enabled by default or by configuration, it may be useful to override the default behaviour. Previously, it was possible to enable the mailmap feature when it was disabled by default or in the configuration, but it was not possible to disable the mailmap feature when it was enabled by default or by the configuration.
The previously undocumented --no-use-mailmap option equalizes this by allowing the user to explicitly enable or disable the mailmap feature according to their requirements.
Signed-off-by: Ariadne Conill <ariadne@dereferenced.org> --- Documentation/config/log.txt | 4 ++-- Documentation/git-log.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index 78d9e4453a..8a01eed46b 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -39,5 +39,5 @@ log.showSignature:: linkgit:git-whatchanged[1] assume `--show-signature`. log.mailmap:: - If true, makes linkgit:git-log[1], linkgit:git-show[1], and - linkgit:git-whatchanged[1] assume `--use-mailmap`. + If false, makes linkgit:git-log[1], linkgit:git-show[1], and + linkgit:git-whatchanged[1] assume `--no-use-mailmap`. 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].
-- 2.17.1