diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-11-04 01:10:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-11-04 01:10:08 -0700 |
commit | 2dfffd3e09b2541b1bfcc840a65eac0251832175 (patch) | |
tree | c65f6dc94b1aa048e5e121ae2422c08e7c5c236e /t/t6023-merge-file.sh | |
parent | Merge branch 'np/fetch' (diff) | |
parent | gitweb: Use config file for repository description and URLs (diff) | |
download | tgif-2dfffd3e09b2541b1bfcc840a65eac0251832175.tar.xz |
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
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions