summaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-21 21:56:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-21 21:56:59 (GMT)
commit2765233c64c35eb43a8b46c377fb8b464469221f (patch)
treea35acf3102d96c2518a9107198e54bd542258f84 /gitweb
parent13b70d2ad96a79fb439c6b4fc0e8058b1762bae2 (diff)
parenta598ded1e2e9cc9f4ce93d091808b475839e6867 (diff)
downloadgit-2765233c64c35eb43a8b46c377fb8b464469221f.zip
git-2765233c64c35eb43a8b46c377fb8b464469221f.tar.gz
git-2765233c64c35eb43a8b46c377fb8b464469221f.tar.bz2
Merge branch 'maint'
* maint: gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled
Diffstat (limited to 'gitweb')
-rwxr-xr-xgitweb/gitweb.perl2
1 files changed, 2 insertions, 0 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 1b83a8d..81dacf2 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];