Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'

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`.
 
-mailmap.file::
+mailmap.*::
        See linkgit:git-shortlog[1].
 
 notes.displayRef::