From: Junio C Hamano <junkio@cox.net>
Date: Thu, 19 Oct 2006 05:09:11 +0000 (-0700)
Subject: Merge branch 'mw/pathinfo'
X-Git-Tag: v1.4.4-rc1~83
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=72bbc38b0a458439f670932ecfb33226e6a9479a;p=git.git

Merge branch 'mw/pathinfo'

* mw/pathinfo:
  gitweb: Fix search form when PATH_INFO is enabled
  gitweb: Document features better
  gitweb: warn if feature cannot be overridden.
  gitweb: start to generate PATH_INFO URLs.

Conflicts:

	gitweb/README
---

72bbc38b0a458439f670932ecfb33226e6a9479a
diff --cc gitweb/README
index 78e6fc05f,abbaf6b8b..e02e90f04
--- a/gitweb/README
+++ b/gitweb/README
@@@ -31,35 -31,18 +33,47 @@@ You can specify the following configura
     environment variable will be loaded instead of the file
     specified when gitweb.cgi was created.
  
 +
+ Runtime gitweb configuration
+ ----------------------------
+ 
+ You can adjust gitweb behaviour using the file specified in `GITWEB_CONFIG`
+ (defaults to 'gitweb_config.perl' in the same directory as the CGI).
+ See the top of 'gitweb.cgi' for the list of variables and some description.
+ The most notable thing that is not configurable at compile time are the
+ optional features, stored in the '%features' variable. You can find further
+ description on how to reconfigure the default features setting in your
+ `GITWEB_CONFIG` or per-project in `project.git/config` inside 'gitweb.cgi'.
+ 
+ 
 +Webserver configuration
 +-----------------------
 +
 +If you want to have one URL for both gitweb and your http://
 +repositories, you can configure apache like this:
 +
 +<VirtualHost www:80>
 +    ServerName git.domain.org
 +    DocumentRoot /pub/git
 +    RewriteEngine on
 +    RewriteRule ^/(.*\.git/(?!/?(info|objects|refs)).*)?$ /cgi-bin/gitweb.cgi%{REQUEST_URI}  [L,PT]
 +    SetEnv	GITWEB_CONFIG	/etc/gitweb.conf
 +</VirtualHost>
 +
 +The above configuration expects your public repositories to live under
 +/pub/git and will serve them as http://git.domain.org/dir-under-pub-git,
 +both as cloneable GIT URL and as browseable gitweb interface.
 +If you then start your git-daemon with --base-path=/pub/git --export-all
 +then you can even use the git:// URL with exactly the same path.
 +
 +Setting the environment variable GITWEB_CONFIG will tell gitweb to use
 +the named file (i.e. in this example /etc/gitweb.conf) as a
 +configuration for gitweb.  Perl variables defined in here will
 +override the defaults given at the head of the gitweb.perl (or
 +gitweb.cgi).  Look at the comments in that file for information on
 +which variables and what they mean.
 +
 +
  Originally written by:
    Kay Sievers <kay.sievers@vrfy.org>