mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled
This commit is contained in:
Junio C Hamano
2011-06-21 14:56:59 -07:00
parent 13b70d2ad9 a598ded1e2
commit 2765233c64
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gitweb/gitweb.perl
View File

@ -328,6 +328,7 @@ our %feature = (
# Enable grep search, which will list the files in currently selected # Enable grep search, which will list the files in currently selected
# tree containing the given string. Enabled by default. This can be # tree containing the given string. Enabled by default. This can be
# potentially CPU-intensive, of course. # potentially CPU-intensive, of course.
# Note that you need to have 'search' feature enabled too.
# To enable system wide have in $GITWEB_CONFIG # To enable system wide have in $GITWEB_CONFIG
# $feature{'grep'}{'default'} = [1]; # $feature{'grep'}{'default'} = [1];
@ -342,6 +343,7 @@ our %feature = (
# Enable the pickaxe search, which will list the commits that modified # Enable the pickaxe search, which will list the commits that modified
# a given string in a file. This can be practical and quite faster # a given string in a file. This can be practical and quite faster
# alternative to 'blame', but still potentially CPU-intensive. # alternative to 'blame', but still potentially CPU-intensive.
# Note that you need to have 'search' feature enabled too.
# To enable system wide have in $GITWEB_CONFIG # To enable system wide have in $GITWEB_CONFIG
# $feature{'pickaxe'}{'default'} = [1]; # $feature{'pickaxe'}{'default'} = [1];