Merge branch 'jk/maint-fast-import-doc-dedup-done' into maint

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 98f390ae46a6359d3a9d5f42fc2cce2186efd242..0b77eb1fa4074fb8ed5ef4cd4c37513f49804e7e 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -958,6 +958,8 @@ _git_clone ()
                        --upload-pack
                        --template=
                        --depth
+                       --single-branch
+                       --branch
                        "
                return
                ;;
@@ -2402,6 +2404,8 @@ __gitk_main ()
 if [[ -n ${ZSH_VERSION-} ]]; then
        echo "WARNING: this script is deprecated, please see git-completion.zsh" 1>&2
 
+       autoload -U +X compinit && compinit
+
        __gitcomp ()
        {
                emulate -L zsh