Merge branch 'fc/zsh-completion'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:42:35 +0000 (22:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:42:35 +0000 (22:42 -0800)
commit75f49651a1b947e2eadd2c831b30892c0f4565c8
tree3b0a8dfe776cb3a424bc932278b5f62793d0543b
parent297638a98e8a7f200571d7d794dbb5e0a35ca000
parent583e4d579d36894ccdc1f4fb4a6dd24c9274c5f8
Merge branch 'fc/zsh-completion'

* 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