Merge branch 'maint-1.7.4' into maint

* maint-1.7.4: completion: replace core.abbrevguard to core.abbrev
2011-06-24 09:40:02 -07:00 · 2011-06-24 09:40:02 -07:00 · 99ac63b092
parent 4f8303905e cdb791f61d
commit 99ac63b092
1 changed files with 1 additions and 1 deletions
--- 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