diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-29 18:06:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-29 18:06:43 -0700 |
| commit | 5b67f9a02854799a4c7863503c96fd0ae9f883bb (patch) | |
| tree | 4af2892ba6b468043ee860a47562bb8e15d3b991 | |
| parent | 3a79d4251b65548a446dfd88fcfa43234e9c5f66 (diff) | |
| parent | 462cbb415e41aa890e78a30a5cc29558baa80b23 (diff) | |
| download | git-5b67f9a02854799a4c7863503c96fd0ae9f883bb.tar.gz | |
Merge branch 'rj/log-decorate-auto'
We forgot to add "git log --decorate=auto" to documentation when we
added the feature back in v2.1.0 timeframe.
* rj/log-decorate-auto:
log: document the --decorate=auto option
| -rw-r--r-- | Documentation/config.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-log.txt | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 53f00dbc26..2e1b2e486e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1956,7 +1956,10 @@ log.decorate:: command. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. - This is the same as the log commands '--decorate' option. + If 'auto' is specified, then if the output is going to a terminal, + the ref names are shown as if 'short' were given, otherwise no ref + names are shown. This is the same as the '--decorate' option + of the `git log`. log.follow:: If `true`, `git log` will act as if the `--follow` option was used when diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 03f958029a..dec379b3e2 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -29,12 +29,14 @@ OPTIONS (works only for a single file). --no-decorate:: ---decorate[=short|full|no]:: +--decorate[=short|full|auto|no]:: Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the - full ref name (including prefix) will be printed. The default option - is 'short'. + full ref name (including prefix) will be printed. If 'auto' is + specified, then if the output is going to a terminal, the ref names + are shown as if 'short' were given, otherwise no ref names are + shown. The default option is 'short'. --source:: Print out the ref name given on the command line by which each |