From: Junio C Hamano Date: Fri, 6 Oct 2006 07:16:05 +0000 (-0700) Subject: Merge branch 'jc/blame' into jc/web-blame X-Git-Tag: v1.4.4-rc1~69^2~4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4b4a5dbb17e1136275665024689625ed5cc5a03d;p=git.git Merge branch 'jc/blame' into jc/web-blame * jc/blame: git-blame --porcelain blame.c: move code to output metainfo into a separate function. git-blame: --show-number (and -n) git-blame: --show-name (and -f) blame.c: whitespace and formatting clean-up. gitweb: Make the Git logo link target to point to the homepage gitweb: blame: Minimize vertical table row padding gitweb: Do not print "log" and "shortlog" redundantly in commit view vc-git.el: Switch to using git-blame instead of git-annotate. git.el: Fixed inverted "renamed from/to" message. tar-tree deprecation: we eat our own dog food. Add git-upload-archive to the main git man page git-commit: cleanup unused function. Fix usage string to match that given in the man page Update the gitweb/README file to include setting the GITWEB_CONFIG environment Conflicts: gitweb/gitweb.perl --- 4b4a5dbb17e1136275665024689625ed5cc5a03d diff --cc gitweb/gitweb.perl index e4ebce622,332006917..0ac05cc71 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@@ -1402,16 -1374,11 +1405,18 @@@ EO } print "\n" . - "\n" . - "

\n" . + "\n"; + + if (-f $site_header) { + open (my $fd, $site_header); + print <$fd>; + close $fd; + } + + print "

\n" . - "" . + "" . " $\"git\"$ " . "\n"; print $cgi->a({-href => esc_url($home_link)}, $home_link_str) . " / ";