mailmap: fix some documentation loose-ends for mailmap.blob

Anywhere we mention mailmap.file, it is probably worth
mentioning mailmap.blob, as well.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 585dac40baabbee291f43a6e7c59c36340286e43..08a185db7fb7192b4e94c83ae6781893e119c6cf 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -167,7 +167,7 @@ log.showroot::
        `git log -p` output would be shown without a diff attached.
        The default is `true`.
 
        `git log -p` output would be shown without a diff attached.
        The default is `true`.
 

-mailmap.file::
+mailmap.*::

        See linkgit:git-shortlog[1].
 
 notes.displayRef::
        See linkgit:git-shortlog[1].
 
 notes.displayRef::

diff --git a/Documentation/mailmap.txt b/Documentation/mailmap.txt
index 288f04e70c8ea5f0b93a4b099a4a49d1fee13b79..bb349c2db3d4f48bdf9ff6ee09ae2344a06c680a 100644 (file)
--- a/Documentation/mailmap.txt
+++ b/Documentation/mailmap.txt
@@ -1,5 +1,6 @@
 If the file `.mailmap` exists at the toplevel of the repository, or at
 If the file `.mailmap` exists at the toplevel of the repository, or at

-the location pointed to by the mailmap.file configuration option, it
+the location pointed to by the mailmap.file or mailmap.blob
+configuration options, it

 is used to map author and committer names and email addresses to
 canonical real names and email addresses.
 
 is used to map author and committer names and email addresses to
 canonical real names and email addresses.