Merge branch 'mg/log-decorate-HEAD'
commitfd707807f012438ab58ce6bd819ea38feca781a7
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:41:51 +0000 (22 12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:41:51 +0000 (22 12:41 -0700)
treeac88cc03b91210b9398a2ed09555c799c845e886
parentd1caa5895458443cc9535b6fda6ff8480383471b
parent429ad204136b2de1cfd2e7f7f5b20df211996c9f
Merge branch 'mg/log-decorate-HEAD'

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