diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-18 22:16:55 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-18 22:16:55 +0400 |
| commit | 7c1b228d26107d2cac9fd9549a6a1cff41c24b51 (patch) | |
| tree | 519d90ef8a478aa004879617757a2b2d30fbec98 /Documentation | |
| parent | bcacc0ebdb17b55040826bf82d1bde4070119250 (diff) | |
| parent | 78646987e41967bb3533fae221205d73ea9af4d1 (diff) | |
Merge branch 'jn/gitweb-plackup'
* jn/gitweb-plackup:
git-instaweb: Add support for running gitweb via 'plackup'
git-instaweb: Wait for server to start before running web browser
git-instaweb: Remove pidfile after stopping web server
git-instaweb: Configure it to work with new gitweb structure
git-instaweb: Put httpd logs in a "$httpd_only" subdirectory
gitweb: Set default destination directory for installing gitweb in Makefile
gitweb: Move static files into seperate subdirectory
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-instaweb.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt index a1f17df074..2c3c4d2994 100644 --- a/Documentation/git-instaweb.txt +++ b/Documentation/git-instaweb.txt @@ -29,7 +29,7 @@ OPTIONS The HTTP daemon command-line that will be executed. Command-line options may be specified here, and the configuration file will be added at the end of the command-line. - Currently apache2, lighttpd, mongoose and webrick are supported. + Currently apache2, lighttpd, mongoose, plackup and webrick are supported. (Default: lighttpd) -m:: |