Merge branch 'fc/zsh-completion' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Feb 2012 22:55:50 +0000 (14:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Feb 2012 22:55:50 +0000 (14:55 -0800)
commit014578e0d0afde6484517d3bd9c3e56f5dea6581
tree905092667a7f2cb372a0b7e98e93d6bea0bacdc9
parentf24a595f72e52b3519067cfb0f05652aabf1e144
parent583e4d579d36894ccdc1f4fb4a6dd24c9274c5f8
Merge branch 'fc/zsh-completion' into maint

* 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