Merge branch 'maint-1.7.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Jun 2011 16:40:02 +0000 (09:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Jun 2011 16:40:02 +0000 (09:40 -0700)
commit99ac63b092f592b7181f94b6479f3a24dbfc8fdb
treedd3c8ad2a3574c15f22cede74ea68463a92f5ff8
parent4f8303905eafaa04fd08a20a08a81436aea2d4b9
parentcdb791f61d71db24fa54363ff6d4b42a46ebbdf1
Merge branch 'maint-1.7.4' into maint

* maint-1.7.4:
  completion: replace core.abbrevguard to core.abbrev
contrib/completion/git-completion.bash