Merge branch 'nd/index-pack-l10n-buf-overflow'

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index a99be97335904f73465ff148b42b04230ed97d3e..69db5783cef46dedabd1169f962fbcc92a028e4e 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -64,7 +64,7 @@ produced by --stat etc.
 
 --log-size::
        Before the log message print out its size in bytes. Intended
-       mainly for porcelain tools consumption. If git is unable to
+       mainly for porcelain tools consumption. If Git is unable to
        produce a valid value size is set to zero.
        Note that only message is considered, if also a diff is shown
        its size is not included.
@@ -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::