diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-07-15 11:41:26 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-07-15 11:41:26 -0700 |
commit | 51d5980ea019a28b38d2f9612314daf3ea536e82 (patch) | |
tree | e8be8ca660b3e9ce704a078d3ef4192b5ec38bc5 /contrib | |
parent | 3f20927717a8541fe607e4227f16ff6e1a5a6e22 (diff) | |
parent | ab7fade9198e0ab3cc5c8705f0383768a3c954db (diff) | |
download | git-51d5980ea019a28b38d2f9612314daf3ea536e82.tar.gz git-51d5980ea019a28b38d2f9612314daf3ea536e82.tar.xz |
Merge branch 'jc/prompt-document-ps1-state-separator' into maint
Docfix.
* jc/prompt-document-ps1-state-separator:
git-prompt.sh: document GIT_PS1_STATESEPARATOR
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/completion/git-prompt.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index f18aedc73..366f0bc1e 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -66,6 +66,10 @@ # git always compare HEAD to @{upstream} # svn always compare HEAD to your SVN upstream # +# You can change the separator between the branch name and the above +# state symbols by setting GIT_PS1_STATESEPARATOR. The default separator +# is SP. +# # By default, __git_ps1 will compare HEAD to your SVN upstream if it can # find one, or @{upstream} otherwise. Once you have set # GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by |