From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Jul 2015 18:41:26 +0000 (-0700)
Subject: Merge branch 'jc/prompt-document-ps1-state-separator' into maint
X-Git-Tag: v2.4.6~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/51d5980ea019a28b38d2f9612314daf3ea536e82?hp=3f20927717a8541fe607e4227f16ff6e1a5a6e22

Merge branch 'jc/prompt-document-ps1-state-separator' into maint

Docfix.

* jc/prompt-document-ps1-state-separator:
git-prompt.sh: document GIT_PS1_STATESEPARATOR
---

diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index f18aedc73b..366f0bc1e9 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