summaryrefslogtreecommitdiffstats
path: root/git-log.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-06 01:06:32 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-06 01:06:32 -0800
commitabad6da146b5fe8e34f22bcbf31be3cb3e9b08e0 (patch)
tree85e1e4b4fcd9b473ecbe709db2d9262dc57ad21d /git-log.txt
parent085534867cb82e0690945a1645554999bcfa542a (diff)
downloadgit-htmldocs-abad6da146b5fe8e34f22bcbf31be3cb3e9b08e0.tar.gz
Autogenerated HTML docs for v1.8.1-151-g32238a
Diffstat (limited to 'git-log.txt')
-rw-r--r--git-log.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-log.txt b/git-log.txt
index 585dac40b..08a185db7 100644
--- a/git-log.txt
+++ b/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::