Merge branch 'maint'

* maint:
  completion: replace core.abbrevguard to core.abbrev
This commit is contained in:
Junio C Hamano 2011-06-26 12:09:11 -07:00
commit 568d44641b

View File

@ -2058,7 +2058,7 @@ _git_config ()
color.ui
commit.status
commit.template
core.abbrevguard
core.abbrev
core.askpass
core.attributesfile
core.autocrlf