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

Finishing touches...

* so/prompt-command:
  make __git_ps1 accept a third parameter in pcmode
contrib/completion/git-prompt.sh