From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Tue, 12 Jan 2021 20:17:47 +0000 (+0100)
Subject: check-mailmap doc: note config options
X-Git-Tag: v2.31.0-rc0~99^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6646cca8927c1c88a13e07bc14144cf5c12610f3;p=thirdparty%2Fgit.git

check-mailmap doc: note config options

Add a passing mention of the mailmap.file and mailmap.blob
configuration options. Before this addition a reader of the
"check-mailmap" manpage would have no idea that a custom map could be
specified, unless they'd happen to e.g. come across it in the "config"
manpage first.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-check-mailmap.txt b/Documentation/git-check-mailmap.txt
index 45a5cfafd8..02f4418323 100644
--- a/Documentation/git-check-mailmap.txt
+++ b/Documentation/git-check-mailmap.txt
@@ -36,6 +36,13 @@ name is provided or known to the 'mailmap', ``Name $$<user@host>$$'' is
 printed; otherwise only ``$$<user@host>$$'' is printed.
 
 
+CONFIGURATION
+-------------
+
+See `mailmap.file` and `mailmap.blob` in linkgit:git-config[1] for how
+to specify a custom `.mailmap` target file or object.
+
+
 MAPPING AUTHORS
 ---------------