diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-21 22:07:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-21 22:07:17 (GMT) |
| commit | cbfbf443b0ec0efe2682156aea4119d3b6d619fd (patch) | |
| tree | 7fa86ad5a50e24d8995937361a9f5570d63409f1 /contrib | |
| parent | fc6b5f523a083f9cc25156294bab4abfb3288663 (diff) | |
| parent | 9f0b4dd0b82b764e7873ce6779766415ebc7f1ea (diff) | |
| download | git-cbfbf443b0ec0efe2682156aea4119d3b6d619fd.zip git-cbfbf443b0ec0efe2682156aea4119d3b6d619fd.tar.gz git-cbfbf443b0ec0efe2682156aea4119d3b6d619fd.tar.bz2 | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-prompt.sh | 3 |
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) |