Merge branch 'sd/log-decorate' into next
commit992c9add1395c392a2d32fbb8f72103cef529a44
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 22:00:39 +0000 (6 15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 22:00:39 +0000 (6 15:00 -0700)
treeca5c3e866ed0e9872007c2e9a09a69c711a16c7a
parent1b8066f52e0709b5e9321054147213e7d349ccb1
parent635530a2fcd4bb3714452403f341f1317ae9c9f6
Merge branch 'sd/log-decorate' into next

* sd/log-decorate:
  log --pretty/--oneline: ignore log.decorate
builtin/log.c