| commit | 99ac63b092f592b7181f94b6479f3a24dbfc8fdb | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <gitster@pobox.com> | Fri Jun 24 09:40:02 2011 -0700 |
| committer | Junio C Hamano <gitster@pobox.com> | Fri Jun 24 09:40:02 2011 -0700 |
| tree | dd3c8ad2a3574c15f22cede74ea68463a92f5ff8 | |
| parent | 4f8303905eafaa04fd08a20a08a81436aea2d4b9 [diff] | |
| parent | cdb791f61d71db24fa54363ff6d4b42a46ebbdf1 [diff] |
Merge branch 'maint-1.7.4' into maint * maint-1.7.4: completion: replace core.abbrevguard to core.abbrev
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index a7d20df..9380060 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash
@@ -2139,7 +2139,7 @@ color.ui commit.status commit.template - core.abbrevguard + core.abbrev core.askpass core.attributesfile core.autocrlf