Merge branch 'fc/zsh-completion' into next
commitc94dd129ee4a4b552110fd2496898901f6b69142
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Feb 2012 23:56:26 +0000 (6 15:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Feb 2012 23:56:26 +0000 (6 15:56 -0800)
treeaf9fb2c7221c7138e7dbfe8f2b732fc6dfe02d2c
parent4f398b8f568a6c9f1eac9b16569d0d147a37485e
parent583e4d579d36894ccdc1f4fb4a6dd24c9274c5f8
Merge branch 'fc/zsh-completion' into next

* fc/zsh-completion:
  completion: simplify __gitcomp and __gitcomp_nl implementations
  completion: use ls -1 instead of rolling a loop to do that ourselves
  completion: work around zsh option propagation bug
contrib/completion/git-completion.bash