projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 76c82f9 5ad6d38)
Merge branch 'instaweb' of git://bogomips.org/git-svn
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Jun 2011 23:43:23 +0000 (16:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Jun 2011 23:43:23 +0000 (16:43 -0700)
commit5dc6411edc6ed5d822b65b9f5cf61ab6fe6d3fa8
tree1da34c2007328f48c49cde7a22412ba89bc95690tree | snapshot
parent76c82f90abde8820461e042c6654673f1147881dcommit | diff
parent5ad6d387f19d9dd28b323f5cfea8663cb7b74617commit | diff
Merge branch 'instaweb' of git://bogomips.org/git-svn

* 'instaweb' of git://bogomips.org/git-svn:
  git-instaweb: Check that correct config file exists for (re)start
  git-instaweb: Move all actions at the end of script
  git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf
  git-instaweb: Extract configuring web server into configure_httpd
Git—the stupid content tracker