diff options
| author | Eric N. Vander Weele <ericvw@gmail.com> | 2015-10-06 21:14:33 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-07 10:37:48 -0700 |
| commit | fd8d07efdaf0ed5570f975c58b2ceb6500e06dd7 (patch) | |
| tree | b99e7f6e0f6e0077c9d40f13a3ea6de8dfbfe1a2 /Documentation | |
| parent | 076c98372e7d3c86d269c1526349a67b73904330 (diff) | |
| download | git-fd8d07efdaf0ed5570f975c58b2ceb6500e06dd7.tar.gz | |
log: Update log.follow doc and add to config.txtdt/log-follow-config
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 6 | ||||
| -rw-r--r-- | Documentation/git-log.txt | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 3e37b93ed2..0b8a663631 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -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. diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 97b9993ee8..03f958029a 100644 --- 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 |