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

diff --cc Documentation/config.txt
index 53f00dbc267db194c7c5558a008fd9d8ec20068c,cbbb524b63c9d7aa28cf67b200bf1ccfb0380d7d..2e1b2e486e615981c14f7e591f3f32aa06cdee7a
--- 1/Documentation/config.txt
--- 2/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 <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.
        Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which

diff --cc Documentation/git-log.txt
Simple merge