Merge branch 'tp/completion'
commit229e65823afca5151afa44f7d3978926b2b1b2b7
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 23:41:39 +0000 (5 15:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 23:41:39 +0000 (5 15:41 -0800)
tree0e18e97a1c6e789e270e29bf664daa31b1ce977c
parent814742672f765e379f7809eab7650e8ad0a24c35
parentddb6d010231432ba75cf109aa7cd282912c88d2d
Merge branch 'tp/completion'

* tp/completion:
  Fixup: Add bare repository indicator for __git_ps1
  Add bare repository indicator for __git_ps1
  completion: More fixes to prevent unbound variable errors
  completion: Better __git_ps1 support when not in working directory
  completion: Use consistent if [...] convention, not "test"
  completion: For consistency, change "git rev-parse" to __gitdir calls
contrib/completion/git-completion.bash