From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Mar 2017 22:07:17 +0000 (-0700)
Subject: Merge branch 'mg/prompt-describe-tags'
X-Git-Tag: v2.13.0-rc0~94
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=cbfbf443b0ec0efe2682156aea4119d3b6d619fd;p=git.git

Merge branch 'mg/prompt-describe-tags'

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
---

cbfbf443b0ec0efe2682156aea4119d3b6d619fd