From: Junio C Hamano Date: Mon, 30 May 2016 01:06:42 +0000 (-0700) Subject: Merge branch 'rj/log-decorate-auto' X-Git-Tag: v2.9.0-rc1~9 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5b67f9a02854799a4c7863503c96fd0ae9f883bb 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 --- 5b67f9a02854799a4c7863503c96fd0ae9f883bb diff --cc Documentation/config.txt index 53f00dbc26,cbbb524b63..2e1b2e486e --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -1956,15 -1699,12 +1956,18 @@@ 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.showroot:: +log.follow:: + If `true`, `git log` will act as if the `--follow` option was used when + a single 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. Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which