Merge branch 'maint'

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