summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2017-03-15 13:15:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-15 20:19:41 (GMT)
commit9f0b4dd0b82b764e7873ce6779766415ebc7f1ea (patch)
treebf38bab6f1e70bde7590851990aafe61b2fcc246 /contrib
parente7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7 (diff)
downloadgit-9f0b4dd0b82b764e7873ce6779766415ebc7f1ea.zip
git-9f0b4dd0b82b764e7873ce6779766415ebc7f1ea.tar.gz
git-9f0b4dd0b82b764e7873ce6779766415ebc7f1ea.tar.bz2
git-prompt: add a describe style for any tags
git-prompt has various describe styles, among them "describe" (by annotated tags) and "default" (by exact match with any tag). Add a mode "tag" that describes by any tag, annotated or not. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-prompt.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 97eacd7..c6cbef3 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -82,6 +82,7 @@
# contains relative to newer annotated tag (v1.6.3.2~35)
# branch relative to newer tag or branch (master~4)
# describe relative to older annotated tag (v1.6.3.1-13-gdd42c2f)
+# tag relative to any older tag (v1.6.3.1-13-gdd42c2f)
# default exactly matching tag
#
# If you would like a colored hint about the current dirty state, set
@@ -443,6 +444,8 @@ __git_ps1 ()
git describe --contains HEAD ;;
(branch)
git describe --contains --all HEAD ;;
+ (tag)
+ git describe --tags HEAD ;;
(describe)
git describe HEAD ;;
(* | default)