Merge branch 'js/rebase-typo-branch-squelch-usage'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index b36290fa6015d9b66dc6a5891ff12f85f279a1c3..5a8309076dc633f431797c4bd59876490b0d7408 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2058,7 +2058,7 @@ _git_config ()
                color.ui
                commit.status
                commit.template
-               core.abbrevguard
+               core.abbrev
                core.askpass
                core.attributesfile
                core.autocrlf