Merge branch 'as/maint-completion-set-u-fix' into next
commit24ce8c2609efa5f22bc9c4060dc14e6fda62f22b
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Jun 2010 19:16:35 +0000 (27 12:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Jun 2010 19:16:35 +0000 (27 12:16 -0700)
tree8927c0adcbcc1d636fb0dd3cd8507eb4e71a2d3a
parent0525b63aa28b3ca04c25e823172f18a1d14f9608
parent6c44b6406bc9093945aa030f33c06ecda47ba7f5
Merge branch 'as/maint-completion-set-u-fix' into next

* as/maint-completion-set-u-fix:
  bash-completion: Fix __git_ps1 to work with "set -u"

Conflicts:
contrib/completion/git-completion.bash
contrib/completion/git-completion.bash