summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-15 15:43:46 -0700
committerJunio C Hamano <gitster@pobox.com>2015-10-15 15:43:46 -0700
commit50337d0f712e37be5f215ff5588204407b2b1d51 (patch)
tree914a333da393ad75b66a14322af452a898caf99e /Documentation/config.txt
parent1811f935225db3809345a78c175df47adf034dfa (diff)
parentfd8d07efdaf0ed5570f975c58b2ceb6500e06dd7 (diff)
downloadgit-50337d0f712e37be5f215ff5588204407b2b1d51.tar.gz
Merge branch 'dt/log-follow-config'
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
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4d3cb107f8..391a0c3c85 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1838,6 +1838,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.