summaryrefslogtreecommitdiff
path: root/gitweb/gitweb.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-23 17:38:22 -0700
committerJunio C Hamano <junkio@cox.net>2007-03-23 23:38:04 -0700
commit1c2c6112a4bf655faa768ddfca067945edf2809e (patch)
tree985973c2d5ac3611db6e25f702eecacf7cb41939 /gitweb/gitweb.perl
parentbab36bf57d7a565e0077e1f5d2e3a10afa319ecc (diff)
parentb08bbae7e1676e5a47fa9054e268ff14ee819a3a (diff)
downloadgit-1c2c6112a4bf655faa768ddfca067945edf2809e.tar.gz
Merge branch 'master' into jc/bisect
This is to merge in the fix for path-limited bisection from the 'master' branch.
Diffstat (limited to 'gitweb/gitweb.perl')
-rwxr-xr-xgitweb/gitweb.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 27b5970bca..5214050a88 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3719,7 +3719,7 @@ sub git_commit {
$formats_nav .=
'(merge: ' .
join(' ', map {
- $cgi->a({-href => href(action=>"commitdiff",
+ $cgi->a({-href => href(action=>"commit",
hash=>$_)},
esc_html(substr($_, 0, 7)));
} @$parents ) .