Merge branch 'fc/zsh-completion'

* fc/zsh-completion:
  completion: start moving to the new zsh completion
  completion: add new zsh completion

diff --cc contrib/completion/git-completion.bash
Simple merge