From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 4 Nov 2007 08:10:08 +0000 (-0700)
Subject: Merge branch 'jn/gitweb'
X-Git-Tag: v1.5.4-rc0~276
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2dfffd3e09b2541b1bfcc840a65eac0251832175;p=git.git

Merge branch 'jn/gitweb'

* jn/gitweb:
  gitweb: Use config file for repository description and URLs
  gitweb: Read repo config using 'git config -z -l'
  gitweb: Add tests for overriding gitweb config with repo config
  gitweb: Use href(-replay=>1, action=>...) to generate alternate views
  gitweb: Use href(-replay=>1, page=>...) to generate pagination links
  gitweb: Easier adding/changing parameters to current URL
  gitweb: Remove CGI::Carp::set_programname() call from t9500 gitweb test
  gitweb: Add 'status_str' to parse_difftree_raw_line output
  gitweb: Always set 'from_file' and 'to_file' in parse_difftree_raw_line
---

2dfffd3e09b2541b1bfcc840a65eac0251832175