]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ah/log-decorate-default-to-auto' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:20:57 +0000 (10:20 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:20:57 +0000 (10:20 +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