Skip to content

Commit 50337d0

Browse files
committed
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
2 parents 1811f93 + fd8d07e commit 50337d0

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Documentation/config.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1838,6 +1838,12 @@ log.decorate::
18381838
specified, the full ref name (including prefix) will be printed.
18391839
This is the same as the log commands '--decorate' option.
18401840

1841+
log.follow::
1842+
If `true`, `git log` will act as if the `--follow` option was used when
1843+
a single <path> is given. This has the same limitations as `--follow`,
1844+
i.e. it cannot be used to follow multiple files and does not work well
1845+
on non-linear history.
1846+
18411847
log.showRoot::
18421848
If true, the initial commit will be shown as a big creation event.
18431849
This is equivalent to a diff against an empty tree.

Documentation/git-log.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ log.date::
185185
dates like `Sat May 8 19:35:34 2010 -0500`.
186186

187187
log.follow::
188-
If a single <path> is given to git log, it will act as
189-
if the `--follow` option was also used. This has the same
190-
limitations as `--follow`, i.e. it cannot be used to follow
191-
multiple files and does not work well on non-linear history.
188+
If `true`, `git log` will act as if the `--follow` option was used when
189+
a single <path> is given. This has the same limitations as `--follow`,
190+
i.e. it cannot be used to follow multiple files and does not work well
191+
on non-linear history.
192192

193193
log.showRoot::
194194
If `false`, `git log` and related commands will not treat the

0 commit comments

Comments
 (0)