global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-29 11:00:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  add-interactive: Clarify “remaining hunks in the file”
  gitweb: Fix typo in hash key name in %opts in git_header_html
This commit is contained in:
Junio C Hamano
2010-06-13 11:23:30 -07:00
parent 2f531d593c a5080d8e10
commit 11ad7c908b
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gitweb/gitweb.perl
View File

@@ -3389,7 +3389,7 @@ sub git_header_html {
}
print $cgi->header(-type=>$content_type, -charset => 'utf-8',
-status=> $status, -expires => $expires)
unless ($opts{'-no_http_headers'});
unless ($opts{'-no_http_header'});
my $mod_perl_version = $ENV{'MOD_PERL'} ? " $ENV{'MOD_PERL'}" : '';
print <<EOF;
<?xml version="1.0" encoding="utf-8"?>