Merge branch 'lh/short-decorate'
commitd6d994d9115ee7ce5bb5ffcfb75fea838174b9c4
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Aug 2009 21:46:12 +0000 (25 14:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Aug 2009 21:46:12 +0000 (25 14:46 -0700)
tree5c5c94d5853acf90d9e379de637c7b21ba5dc92f
parentb91069ae9a6cb2d92fa6a5ed6d258bed530abcc7
parent33e7018c459e6583b899690cabd21c808ffd3c85
Merge branch 'lh/short-decorate'

* lh/short-decorate:
  git-log: allow --decorate[=short|full]