Merge branch 'rh/hide-prompt-in-ignored-directory'
commite1ef7d177c3fcfdd25df9c4b67d36012bedebd74
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2015 20:34:01 +0000 (14 12:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2015 20:34:01 +0000 (14 12:34 -0800)
tree0035d368a857b7c7614b498c645ac1aa7a059fd0
parent1e7ef5d9bf49a7de85e9a4d25f1a44ed955c40fc
parent0120b8c85c7a52b26ea7062fec349d178a4e0208
Merge branch 'rh/hide-prompt-in-ignored-directory'

* rh/hide-prompt-in-ignored-directory:
  git-prompt.sh: allow to hide prompt for ignored pwd
  git-prompt.sh: if pc mode, immediately set PS1 to a plain prompt
contrib/completion/git-prompt.sh