Merge branch 'jc/utf8'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6452a8be144f92f9140fb133acda4d9fd32f2b15..178e0e1e209e066ad220d6ba95be0728c2db5e99 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -267,6 +267,10 @@ i18n.commitEncoding::
        browser (and possibly at other places in the future or in other
        porcelains). See e.g. gitlink:git-mailinfo[1]. Defaults to 'utf-8'.
 
+i18n.logOutputEncoding::
+       Character encoding the commit messages are converted to when
+       running `git-log` and friends.
+
 log.showroot::
        If true, the initial commit will be shown as a big creation event.
        This is equivalent to a diff against an empty tree.