summaryrefslogtreecommitdiff
path: root/contrib/completion/git-prompt.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-01 21:02:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-07-01 21:02:32 (GMT)
commitd70bc3b97a4792ba99117ac6b0051ff367d78419 (patch)
tree1b411fd1aec11a9891ca0f56d05243335836e763 /contrib/completion/git-prompt.sh
parent15b3f711481245d0d403b424a7856b76e7bae2bb (diff)
parentab7fade9198e0ab3cc5c8705f0383768a3c954db (diff)
downloadgit-d70bc3b97a4792ba99117ac6b0051ff367d78419.zip
git-d70bc3b97a4792ba99117ac6b0051ff367d78419.tar.gz
git-d70bc3b97a4792ba99117ac6b0051ff367d78419.tar.bz2
Merge branch 'jc/prompt-document-ps1-state-separator'
Docfix. * jc/prompt-document-ps1-state-separator: git-prompt.sh: document GIT_PS1_STATESEPARATOR
Diffstat (limited to 'contrib/completion/git-prompt.sh')
-rw-r--r--contrib/completion/git-prompt.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index f18aedc..366f0bc 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