Merge branch 'pd/bash-4-completion' into next
commitdbf80ff43003a2d255c4cc9e7d4be07efb8b07b1
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 00:46:52 +0000 (21 16:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 00:46:52 +0000 (21 16:46 -0800)
tree6e217890379a09ef1ae8f6bf3bea1395ff58e060
parent16e1351eaa9eb73c75c27e5c308d781b2ced215f
parent52c9d8e27592347a03962f47999bd32caf578d0f
Merge branch 'pd/bash-4-completion' into next

* pd/bash-4-completion:
  bash: simple reimplementation of _get_comp_words_by_ref
  bash: get --pretty=m<tab> completion to work with bash v4

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