projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cf666c 9b93aeb)
Merge branch 'jn/gitweb-test'
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 22:59:22 +0000 (14:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 22:59:22 +0000 (14:59 -0800)
* jn/gitweb-test:
  gitweb/Makefile: Include gitweb/config.mak
  gitweb/Makefile: Add 'test' and 'test-installed' targets
  t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED
  gitweb: Move call to evaluate_git_version after evaluate_gitweb_config

1  2 
gitweb/Makefile patch | diff1 | diff2 | blob | history
gitweb/gitweb.perl patch | diff1 | diff2 | blob | history

diff --cc gitweb/Makefile
Simple merge
diff --cc gitweb/gitweb.perl
Simple merge
Git—the stupid content tracker