diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-12-07 15:13:02 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-12-07 15:13:02 -0800 |
commit | 3a59bb22db24ff90c173ffb462fe67902a213d96 (patch) | |
tree | aa4f56dcd531c232ea18a5242805e86cd50ced76 /gitweb | |
parent | 2dd620286e84e4e76226a3511af6d14755b8c809 (diff) | |
parent | 1c2ed59de2d14ad6ee9daa4d4f7254297d9a3830 (diff) | |
download | git-3a59bb22db24ff90c173ffb462fe67902a213d96.tar.gz git-3a59bb22db24ff90c173ffb462fe67902a213d96.tar.xz |
Merge branch 'maint'
* maint:
GIT 1.6.0.5
"git diff <tree>{3,}": do not reverse order of arguments
tag: delete TAG_EDITMSG only on successful tag
gitweb: Make project specific override for 'grep' feature work
http.c: use 'git_config_string' to get 'curl_http_proxy'
fetch-pack: Avoid memcpy() with src==dst
Diffstat (limited to 'gitweb')
-rwxr-xr-x | gitweb/gitweb.perl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 95988fba4..951739210 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -241,6 +241,7 @@ our %feature = ( # $feature{'grep'}{'override'} = 1; # and in project config gitweb.grep = 0|1; 'grep' => { + 'sub' => \&feature_grep, 'override' => 0, 'default' => [1]}, |