diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-26 19:09:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-26 19:09:11 (GMT) |
| commit | 568d44641bc8e754157cf551e58154106d3532ae (patch) | |
| tree | 99d6411f9d0887a839cf453d90150ee61a483eb0 /contrib | |
| parent | 7af4fc9cf3e3538a9bfb8b14feeacdeb7f6db7d5 (diff) | |
| parent | 99ac63b092f592b7181f94b6479f3a24dbfc8fdb (diff) | |
| download | git-568d44641bc8e754157cf551e58154106d3532ae.zip git-568d44641bc8e754157cf551e58154106d3532ae.tar.gz git-568d44641bc8e754157cf551e58154106d3532ae.tar.bz2 | |
Merge branch 'maint'
* maint:
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 b36290f..5a83090 100755 --- 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 |