Merge branch 'ah/log-decorate-default-to-auto'
commitbf32fc5664a1946028a93859005600a70ee1c660
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 May 2017 04:46:02 +0000 (23 13:46 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 May 2017 04:46:03 +0000 (23 13:46 +0900)
tree036441bfaf459eb9b45155f6d7c222920bb70d74
parentbea1579b80f3e72f44f13dc20398e71b333af2a8
parentc74271aae74c951ab321aa16fe573ea3bcab86ba
Merge branch 'ah/log-decorate-default-to-auto'

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