Merge branch 'jk/cvsimport-does-not-work-with-cvsps3'

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index a99be97335904f73465ff148b42b04230ed97d3e..22c0d6e4b1074b71468ac1c9b16d7eeb0434e225 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -172,7 +172,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::