Merge branch 'jc/prompt-document-ps1-state-separator' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Jul 2015 18:41:26 +0000 (11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Jul 2015 18:41:26 +0000 (11:41 -0700)
Docfix.

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

1  2 
contrib/completion/git-prompt.sh
Simple merge