Merge branch 'ah/log-decorate-default-to-auto'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Apr 2017 07:21:51 +0000 (00:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Apr 2017 07:21:51 +0000 (00:21 -0700)
The default behaviour of "git log" in an interactive session has
been changed to enable "--decorate".

* ah/log-decorate-default-to-auto:
  log: if --decorate is not given, default to --decorate=auto

1  2 
builtin/log.c

diff --cc builtin/log.c
Simple merge