Merge branch 'so/prompt-command'
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Dec 2012 00:00:07 +0000 (16:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Dec 2012 00:00:07 +0000 (16:00 -0800)
Finishing touches...

* so/prompt-command:
  make __git_ps1 accept a third parameter in pcmode

1  2 
contrib/completion/git-prompt.sh

Simple merge