From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Jun 2010 18:16:55 +0000 (-0700)
Subject: Merge branch 'jn/gitweb-plackup'
X-Git-Tag: v1.7.2-rc0~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c1b228d26107d2cac9fd9549a6a1cff41c24b51;p=thirdparty%2Fgit.git

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
---

7c1b228d26107d2cac9fd9549a6a1cff41c24b51