Merge branch 'bc/repack'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 554977b89519fb11a6a02d100bf65c3531e86f6f..002a06689343df9201d8c08beff8147c8a55e8b7 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -817,6 +817,12 @@ instaweb.port::
        The port number to bind the gitweb httpd to. See
        linkgit:git-instaweb[1].
 
+log.date::
+       Set default date-time mode for the log command. Setting log.date
+       value is similar to using git log's --date option. The value is one of
+       following alternatives: {relative,local,default,iso,rfc,short}.
+       See linkgit:git-log[1].
+
 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.