Andrew's git / gitweb.git / diff
?
Merge branch 'rh/hide-prompt-in-ignored-directory'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2015 20:34:01 +0000 (12:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2015 20:34:01 +0000 (12:34 -0800)
* 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

1  2 
contrib/completion/git-prompt.sh patch | diff1 | diff2 | blob | history
diff --cc contrib/completion/git-prompt.sh
Simple merge