Merge branch 'bc/log-decoration'
commitf8c2e3f67133e82b1df9c4cc806ba5d67670e425
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Jan 2014 18:32:39 +0000 (10 10:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jan 2014 18:32:39 +0000 (10 10:32 -0800)
tree390e58157ae4392d7bb2bfc478cd2fc929bc7400
parentc4bccea2d52dd59e0e6200cebba3df2dfcf593ea
parent5e1361ccdbfaf328b5bae1eae29f16ba965c54b1
Merge branch 'bc/log-decoration'

"git log --decorate" did not handle a tag pointed by another tag
nicely.

* bc/log-decoration:
  log: properly handle decorations with chained tags
log-tree.c