Merge branch 'ah/log-decorate-default-to-auto' into maint
commitfb11de9ef58305a3dce6ebaaf53cc8c7ff9c5231
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:20:57 +0000 (4 10:20 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:20:57 +0000 (4 10:20 +0900)
tree6a940ab652f29142b7d11add8bd632d358af843b
parent6c940eb94d8c6ed75413826e067df78f30b5707f
parentc74271aae74c951ab321aa16fe573ea3bcab86ba
Merge branch 'ah/log-decorate-default-to-auto' into maint

Setting "log.decorate=false" in the configuration file did not take
effect in v2.13, which has been corrected.

* ah/log-decorate-default-to-auto:
  builtin/log: honor log.decorate
builtin/log.c