Merge branch 'sg/completion-updates'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:47:00 +0000 (16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:47:00 +0000 (16:47 -0700)
* 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

1  2 
contrib/completion/git-completion.bash
Simple merge