diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-06-21 14:56:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-21 14:56:59 -0700 |
| commit | 2765233c64c35eb43a8b46c377fb8b464469221f (patch) | |
| tree | a35acf3102d96c2518a9107198e54bd542258f84 | |
| parent | Merge branch 'mk/grep-pcre' (diff) | |
| parent | gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled (diff) | |
| download | tgif-2765233c64c35eb43a8b46c377fb8b464469221f.tar.xz | |
Merge branch 'maint'
* maint:
gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled
| -rwxr-xr-x | gitweb/gitweb.perl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 1b83a8d0a0..81dacf2b6a 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -328,6 +328,7 @@ our %feature = ( # Enable grep search, which will list the files in currently selected # tree containing the given string. Enabled by default. This can be # potentially CPU-intensive, of course. + # Note that you need to have 'search' feature enabled too. # To enable system wide have in $GITWEB_CONFIG # $feature{'grep'}{'default'} = [1]; @@ -342,6 +343,7 @@ our %feature = ( # Enable the pickaxe search, which will list the commits that modified # a given string in a file. This can be practical and quite faster # 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 # $feature{'pickaxe'}{'default'} = [1]; |