Merge branch 'fc/zsh-completion'
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Dec 2020 23:11:22 +0000 (15:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Dec 2020 23:11:22 +0000 (15:11 -0800)
commit7d92da37871dceb732a56f5a3aecf0be872a40ab
tree9250b7436625cc3bfb32bcbadc8f9513881b6186
parent90051e5b5e63d415fad6d38b999b9a0582189a4b
parent076496457e1abe3058d48cb5c387d1face704494
Merge branch 'fc/zsh-completion'

Hotfix for a recent breakage.

* fc/zsh-completion:
  completion: bash: fix gitk alias regression
  completion: zsh: fix file completion regression
contrib/completion/git-completion.bash