Andrew's git / gitweb.git / diff
?
Merge branch 'mg/prompt-describe-tags'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:07:17 +0000 (15:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:07:17 +0000 (15:07 -0700)
The command line prompt (in contrib/) learned a new 'tag' style
that can be specified with GIT_PS1_DESCRIBE_STYLE, to describe a
detached HEAD with "git describe --tags".

* mg/prompt-describe-tags:
git-prompt: add a describe style for any tags

Trivial merge