Merge branch 'mg/log-decorate-HEAD' into next
commit009342bde9568fcefeccb025f6ada17b67381d56
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 May 2015 20:40:12 +0000 (19 13:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 May 2015 20:40:12 +0000 (19 13:40 -0700)
tree124e76b06defc71b3a600cc6ae938d0143a1dfe0
parentc83fde1eb59b320a0618e8f15b2fa73ddecf37b4
parent429ad204136b2de1cfd2e7f7f5b20df211996c9f
Merge branch 'mg/log-decorate-HEAD' into next

The "log --decorate" enhancement in Git 2.4 that shows the commit
at the tip of the current branch e.g. "HEAD -> master", did not
work with --decorate=full.

* mg/log-decorate-HEAD:
  log: do not shorten decoration names too early
  log: decorate HEAD with branch name under --decorate=full, too
log-tree.c