Code

Merge branch 'pd/bash-4-completion'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 22:40:55 +0000 (14:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 22:40:55 +0000 (14:40 -0800)
commit02fedc0f4835de7414b78e21739464a29520c94a
tree6e217890379a09ef1ae8f6bf3bea1395ff58e060
parente39212ab08e8d37dda5d8fd32b54099fe01dbbdb
parent52c9d8e27592347a03962f47999bd32caf578d0f
Merge branch 'pd/bash-4-completion'

* 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