Merge branch 'mg/log-decorate-HEAD' into maint
commit5efef305d888f49ed8fce3708169a0df552ca24f
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:15 +0000 (5 12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:15 +0000 (5 12:00 -0700)
treeb8cf09cc9556bfa122ad17e7b0cd7817d0726290
parent5e896a37c7aa3cf7bf770e7dd2d93af928a4140a
parent429ad204136b2de1cfd2e7f7f5b20df211996c9f
Merge branch 'mg/log-decorate-HEAD' into maint

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