Skip to content

Commit

Permalink
Merge branch 'dt/log-follow-config'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Oct 15, 2015
2 parents 1811f93 + fd8d07e commit 50337d0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions Documentation/git-log.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 50337d0

Please sign in to comment.