Merge branch 'jc/prompt-document-ps1-state-separator'
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Jul 2015 21:02:32 +0000 (14:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Jul 2015 21:02:32 +0000 (14:02 -0700)
Docfix.

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

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