]> granicus.if.org Git - git/commitdiff
Merge branch 'lt/log-auto-decorate'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:18:41 +0000 (12:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:18:41 +0000 (12:18 -0700)
* lt/log-auto-decorate:
  git log: support "auto" decorations

1  2 
builtin/log.c

diff --cc builtin/log.c
Simple merge