Merge branch 'so/prompt-command'

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

Junio C Hamano committed Dec 27, 2012 at 16:00 UTC 3b73c7d1c8a3e76c6e15a294bd5c3e2a04efa7ea

No changes.