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)
commit51d5980ea019a28b38d2f9612314daf3ea536e82
treee8be8ca660b3e9ce704a078d3ef4192b5ec38bc5
parent3f20927717a8541fe607e4227f16ff6e1a5a6e22
parentab7fade9198e0ab3cc5c8705f0383768a3c954db
Merge branch 'jc/prompt-document-ps1-state-separator' into maint

Docfix.

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