Merge branch 'sg/completion-updates'
commit018443526875456d335fef2dfbc78bc4de2d340d
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:47:00 +0000 (16 16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:47:00 +0000 (16 16:47 -0700)
tree1fcabab89ae4e031110f09c417b2b060d0d73b56
parent8cee0f1d8a6a60fb38cbb27dc9076136c16d9f4b
parent2df7683b6e1eace60994244da7d23ea96e17fdc6
Merge branch 'sg/completion-updates'

* sg/completion-updates:
  Revert "completion: don't declare 'local words' to make zsh happy"
  git-completion: fix regression in zsh support
  completion: move private shopt shim for zsh to __git_ namespace
  completion: don't declare 'local words' to make zsh happy
contrib/completion/git-completion.bash