Merge branch 'maint-1.7.4' into maint

* maint-1.7.4: completion: replace core.abbrevguard to core.abbrev
xu-kai-xu · Jun 24, 2011 · 99ac63b · 99ac63b
2 parents 4f83039 + cdb791f
commit 99ac63b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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