Merge branch 'jk/notes-dwim-doc'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index e935cbdc0058ce0ff629237d0f928bf5b5815bb3..4d3cb107f853463c92af67ba9da70cbf3485060f 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1829,9 +1829,7 @@ log.abbrevCommit::
 log.date::
        Set the default date-time mode for the 'log' command.
        Setting a value for log.date is similar to using 'git log''s
-       `--date` option.  Possible values are `relative`, `local`,
-       `default`, `iso`, `rfc`, and `short`; see linkgit:git-log[1]
-       for details.
+       `--date` option.  See linkgit:git-log[1] for details.
 
 log.decorate::
        Print out the ref names of any commits that are shown by the log