Merge branch 'so/prompt-command'
commit4881616c1a4fa7b19ca2c722ef0b3d48316ac8ef
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Dec 2012 19:08:13 +0000 (12 11:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Dec 2012 19:08:13 +0000 (12 11:08 -0800)
tree95df4e05cfe3a3ddbb3fa818a642d177b40aad73
parent75ed918bda00a0786bab7de3d220765226fe3f1e
parentde29a7ac0ec31d8f5fa91b7d2f0294165787d558
Merge branch 'so/prompt-command'

* so/prompt-command:
  git-prompt.sh: update PROMPT_COMMAND documentation
contrib/completion/git-prompt.sh