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>
Jeff King committed
Dec 13, 2012 at 08:08 UTC
d5422b0c0ba9948166115f1b178c34ee65fc3057
2 files changed
+3
-2
Documentation/git-log.txt
+1
-1
@@ -167,7 +167,7 @@ log.showroot::
167
`git log -p` output would be shown without a diff attached.
168
The default is `true`.
169
170
-mailmap.file::
170
+mailmap.*::
171
See linkgit:git-shortlog[1].
172
173
notes.displayRef::
Documentation/mailmap.txt
+2
-1
@@ -1,5 +1,6 @@
1
If the file `.mailmap` exists at the toplevel of the repository, or at
2
-the location pointed to by the mailmap.file configuration option, it
2
+the location pointed to by the mailmap.file or mailmap.blob
3
+configuration options, it
4
is used to map author and committer names and email addresses to
5
canonical real names and email addresses.
6