Merge branch 'maint'

* maint:
  completion: replace core.abbrevguard to core.abbrev
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index b36290f..5a83090 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2058,7 +2058,7 @@
 		color.ui
 		commit.status
 		commit.template
-		core.abbrevguard
+		core.abbrev
 		core.askpass
 		core.attributesfile
 		core.autocrlf