summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorPavan Kumar Sunkara <pavan.sss1991@gmail.com>2010-05-28 06:25:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-01 00:56:53 (GMT)
commitc0cb4ed3e653a37a53ef3a1e08daa42ac9cbc3fc (patch)
tree601f142f93eb0eb7775905b63eae545416f5b661 /git-merge-octopus.sh
parentbe5347b398dd35cdbbb2e2d8b102aacca853df86 (diff)
downloadgit-c0cb4ed3e653a37a53ef3a1e08daa42ac9cbc3fc.zip
git-c0cb4ed3e653a37a53ef3a1e08daa42ac9cbc3fc.tar.gz
git-c0cb4ed3e653a37a53ef3a1e08daa42ac9cbc3fc.tar.bz2
git-instaweb: Configure it to work with new gitweb structure
git-instaweb in its current form (re)creates gitweb.cgi and (some of) required static files in $GIT_DIR/gitweb/ directory. Splitting gitweb would make it difficult for git-instaweb to continue with this method. Use the instaweb.gitwebdir config variable to point git-instaweb script to a global directory which contains gitweb files as server root and the httpd.conf along with server logs and pid go into '$(GIT_DIR)/gitweb' directory. Signed-off-by: Pavan Kumar Sunkara <pavan.sss1991@gmail.com> Mentored-by: Christian Couder <chriscool@tuxfamily.org> Mentored-by: Petr Baudis <pasky@ucw.cz> Acked-by: Jakub Narebski <jnareb@gmail.com> Acked-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions