diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-12-11 15:50:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-11 15:50:10 -0800 |
| commit | f993e2e15dbbb8a7d287c42a33e6d1887b594c52 (patch) | |
| tree | f8ff61283db304a9213185b7998c08589f7f2939 /contrib | |
| parent | Sync with 1.8.0.2 (diff) | |
| parent | git-prompt: Document GIT_PS1_DESCRIBE_STYLE (diff) | |
| download | tgif-f993e2e15dbbb8a7d287c42a33e6d1887b594c52.tar.xz | |
Merge branch 'maint'
* maint:
git-prompt: Document GIT_PS1_DESCRIBE_STYLE
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-prompt.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 00fc099b8d..a8b53ba5f3 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -55,10 +55,19 @@ # GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by # setting the bash.showUpstream config variable. # +# If you would like to see more information about the identity of +# commits checked out as a detached HEAD, set GIT_PS1_DESCRIBE_STYLE +# to one of these values: +# +# 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) +# default exactly matching tag +# # If you would like a colored hint about the current dirty state, set # GIT_PS1_SHOWCOLORHINTS to a nonempty value. The colors are based on # the colored output of "git status -sb". -# + # __gitdir accepts 0 or 1 arguments (i.e., location) # returns location of .git repo __gitdir () |