diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-06-26 12:09:11 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-06-26 12:09:11 -0700 |
commit | 568d44641bc8e754157cf551e58154106d3532ae (patch) | |
tree | 99d6411f9d0887a839cf453d90150ee61a483eb0 | |
parent | Git 1.7.6-rc3 (diff) | |
parent | Merge branch 'maint-1.7.4' into maint (diff) | |
download | tgif-568d44641bc8e754157cf551e58154106d3532ae.tar.xz |
Merge branch 'maint'
* maint:
completion: replace core.abbrevguard to core.abbrev
-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 b36290fa60..5a8309076d 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 |