Merge branch 'sb/bisect-run-empty'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 6934064ee9376f30a3a7b7ae6ac324d354ea8899..f07f16b28fe80de32ebc0431b5d1d8f5a64e19d8 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1249,7 +1249,8 @@ _git_checkout ()
        --*)
                __gitcomp "
                        --quiet --ours --theirs --track --no-track --merge
-                       --conflict= --orphan --patch
+                       --conflict= --orphan --patch --detach --ignore-skip-worktree-bits
+                       --recurse-submodules --no-recurse-submodules
                        "
                ;;
        *)
@@ -2349,6 +2350,7 @@ _git_config ()
                advice.rmHints
                advice.statusHints
                advice.statusUoption
+               advice.ignoredHook
                alias.
                am.keepcr
                am.threeWay