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

1  2 
builtin/log.c
diff --cc builtin/log.c
Simple merge