Merge branch 'lh/short-decorate'
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Aug 2009 21:46:12 +0000 (14:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Aug 2009 21:46:12 +0000 (14:46 -0700)
* lh/short-decorate:
  git-log: allow --decorate[=short|full]


Trivial merge