Merge branch 'fc/prompt-zsh-read-from-file'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 May 2014 18:53:14 +0000 (11:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 May 2014 18:53:14 +0000 (11:53 -0700)
commit6308767f0bb58116cb405e1f4f77f5dfc1589920
tree0ce2de7b3fa470bd46592c3a6d9765d1de794e21
parent998f84075acbdc02eaa3b1b0d0f96a3f2a9165a6
parent66ab301c165b5ba6395b7bcc7cf35a7592f9f46f
Merge branch 'fc/prompt-zsh-read-from-file'

* fc/prompt-zsh-read-from-file:
  contrib: completion: fix 'eread()' namespace
contrib/completion/git-prompt.sh