Merge branch 'hv/fetch-moved-submodules-on-demand'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d93441747523ab2971e114cd6a02d56b79ba3382..fcd83311a36191d7a540c411ce99f02fda57c1b3 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1385,7 +1385,7 @@ _git_describe ()
                __gitcomp "
                        --all --tags --contains --abbrev= --candidates=
                        --exact-match --debug --long --match --always --first-parent
-                       --exclude
+                       --exclude --dirty --broken
                        "
                return
        esac
@@ -2350,6 +2350,7 @@ _git_config ()
                advice.rmHints
                advice.statusHints
                advice.statusUoption
+               advice.ignoredHook
                alias.
                am.keepcr
                am.threeWay