Merge branch 'maint-1.7.4' into maint

* maint-1.7.4: completion: replace core.abbrevguard to core.abbrev

Merge branch 'maint-1.7.4' into maint
* maint-1.7.4: completion: replace core.abbrevguard to core.abbrev
99ac63b0 · Junio C Hamano · 4f830390 · cdb791f6 · 99ac63b0
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

contrib/completion/git-completion.bash contrib/completion/git-completion.bash +1 -1

未找到文件。
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2139,7 +2139,7 @@ _git_config ()
 		color.ui
 		commit.status
 		commit.template
-		core.abbrevguard
+		core.abbrev
 		core.askpass
 		core.attributesfile
 		core.autocrlf