diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-16 14:32:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-16 14:32:42 -0700 |
| commit | d5fea2418e122c6e1d5dddd57fc8d5dd95adea4e (patch) | |
| tree | a492c76c4528efbc58b3496541252d7d50531f8f | |
| parent | 267ebf6c84eb4437c219c16848678b090b4af6e2 (diff) | |
| parent | fd8d07efdaf0ed5570f975c58b2ceb6500e06dd7 (diff) | |
| download | git-d5fea2418e122c6e1d5dddd57fc8d5dd95adea4e.tar.gz | |
Merge branch 'dt/log-follow-config' into maint
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
| -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 0cc87a6f65..fec0dea5d0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1840,6 +1840,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 |