cherry-pick/revert: add scissors line on merge conflict

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 90761f169444c165f0e94ebc3b7731cd8d85d3f0..b02e922dc33d248493df4bf6e1bb42f342e38daa 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -192,6 +192,10 @@ log.date::
        Default format for human-readable dates.  (Compare the
        `--date` option.)  Defaults to "default", which means to write
        dates like `Sat May 8 19:35:34 2010 -0500`.
++
+If the format is set to "auto:foo" and the pager is in use, format
+"foo" will be the used for the date format. Otherwise "default" will
+be used.
 
 log.follow::
        If `true`, `git log` will act as if the `--follow` option was used when