diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-24 09:40:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-24 09:40:02 -0700 |
| commit | 99ac63b092f592b7181f94b6479f3a24dbfc8fdb (patch) | |
| tree | dd3c8ad2a3574c15f22cede74ea68463a92f5ff8 /contrib | |
| parent | 4f8303905eafaa04fd08a20a08a81436aea2d4b9 (diff) | |
| parent | cdb791f61d71db24fa54363ff6d4b42a46ebbdf1 (diff) | |
| download | git-99ac63b092f592b7181f94b6479f3a24dbfc8fdb.tar.gz | |
Merge branch 'maint-1.7.4' into maint
* maint-1.7.4:
completion: replace core.abbrevguard to core.abbrev
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index a7d20df233..93800601f8 100755 --- 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 |