Merge branch 'dt/log-follow-config' into maint

Description of the "log.follow" configuration variable in "git log"
documentation is now also copied to "git config" documentation.

* dt/log-follow-config:
log: Update log.follow doc and add to config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0cc87a6f6565bbe794420bc47be8407e4ac47f22..fec0dea5d03343b40caf35ea6de6753049f08d35 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1840,6 +1840,12 @@ log.decorate::
        specified, the full ref name (including prefix) will be printed.
        This is the same as the log commands '--decorate' option.
 
+log.follow::
+       If `true`, `git log` will act as if the `--follow` option was used when
+       a single <path> is given.  This has the same limitations as `--follow`,
+       i.e. it cannot be used to follow multiple files and does not work well
+       on non-linear history.
+
 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.

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 97b9993ee8c2aeef504e96a041424e1d396a75d8..03f958029ad7a35ec29f111217cd76ba21de9b5e 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -185,10 +185,10 @@ log.date::
        dates like `Sat May 8 19:35:34 2010 -0500`.
 
 log.follow::
-       If a single <path> is given to git log, it will act as
-       if the `--follow` option was also used.  This has the same
-       limitations as `--follow`, i.e. it cannot be used to follow
-       multiple files and does not work well on non-linear history.
+       If `true`, `git log` will act as if the `--follow` option was used when
+       a single <path> is given.  This has the same limitations as `--follow`,
+       i.e. it cannot be used to follow multiple files and does not work well
+       on non-linear history.
 
 log.showRoot::
        If `false`, `git log` and related commands will not treat the