Skip to content

Commit

Permalink
log: Update log.follow doc and add to config.txt
Browse files Browse the repository at this point in the history
Documentation/config.txt does not include the documentation for
log.follow that is in Documentation/git-log.txt.  This commit adds the
log.follow documentation to config.txt and also updates the wording to
be consistent with the format that is followed by other boolean
configuration variables.

Signed-off-by: Eric N. Vander Weele <ericvw@gmail.com>
Acked-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Eric N. Vander Weele authored and Junio C Hamano committed Oct 7, 2015
1 parent 076c983 commit fd8d07e
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 @@ -1792,6 +1792,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 fd8d07e

Please sign in to comment.