diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-14 18:50:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-14 18:50:01 -0700 |
| commit | 3545193735522f733fdb4e345f16ddf131e2007a (patch) | |
| tree | 9d14e21d5b1c03ec54d9a7b45defcb06b9caa69e /gitweb | |
| parent | 460c6996e27208898d3e24897e2ea35295c1cbf1 (diff) | |
| parent | 52e7b744d365ad4fcbb49fbb2a7b59ddfea90440 (diff) | |
| download | git-3545193735522f733fdb4e345f16ddf131e2007a.tar.gz git-3545193735522f733fdb4e345f16ddf131e2007a.tar.xz | |
Merge branch 'maint'
* maint:
Prepare for 1.5.1.5 Release Notes
gitweb: Add a few comments about %feature hash
git-am: Clean up the asciidoc documentation
Documentation: format-patch has no --mbox option
builtin-log.c: Fix typo in comment
Fix git-clone buglet for remote case.
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index c2eeca9fa..a13043dee 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -102,10 +102,13 @@ our %feature = ( # 'override' => allow-override (boolean), # 'default' => [ default options...] (array reference)} # - # if feature is overridable (it means that allow-override has true value, + # if feature is overridable (it means that allow-override has true value), # then feature-sub will be called with default options as parameters; # return value of feature-sub indicates if to enable specified feature # + # if there is no 'sub' key (no feature-sub), then feature cannot be + # overriden + # # use gitweb_check_feature(<feature>) to check if <feature> is enabled # Enable the 'blame' blob view, showing the last commit that modified @@ -138,6 +141,7 @@ our %feature = ( # Enable text search, which will list the commits which match author, # committer or commit text to a given string. Enabled by default. + # Project specific override is not supported. 'search' => { 'override' => 0, 'default' => [1]}, |