aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-12-13 08:08:12 -0500
committerJunio C Hamano <gitster@pobox.com>2012-12-13 10:19:26 -0800
commitd5422b0c0ba9948166115f1b178c34ee65fc3057 (patch)
treed877696149a8e18359ca6fe2af93ed4be7f030bc /Documentation/git-log.txt
parent938a60d64fc91fd7d646ed33fad527b724d1e534 (diff)
downloadgit-d5422b0c0ba9948166115f1b178c34ee65fc3057.tar.gz
git-d5422b0c0ba9948166115f1b178c34ee65fc3057.tar.xz
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>
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r--Documentation/git-log.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 585dac40b..08a185db7 100644
--- 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`.
-mailmap.file::
+mailmap.*::
See linkgit:git-shortlog[1].
notes.displayRef::