Dear diary, on Tue, Oct 24, 2006 at 12:08:08AM CEST, I got a letter
where Jakub Narebski <jnareb@xxxxxxxxx> said that...
> @@ -3307,19 +3303,19 @@ sub git_commitdiff {
> } elsif (scalar @{$co{'parents'}} == 1) {
> # single parent commit
> $formats_nav .=
> - ' (parent: ' .
> + ' (' .
> $cgi->a({-href => href(action=>"commitdiff",
> hash=>$co{'parent'})},
> - esc_html(substr($co{'parent'}, 0, 7))) .
> + 'parent') .
> ')';
> } else {
> # merge commit
> $formats_nav .=
> - ' (merge: ' .
> + ' (' .
> join(' ', map {
> $cgi->a({-href => href(action=>"commitdiff",
> hash=>$_)},
> - esc_html(substr($_, 0, 7)));
> + 'parent');
> } @{$co{'parents'}} ) .
> ')';
> }
For people not used to git, it would be more informative to keep the
'merge' text there.
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
#!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj
$/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1
lK[d2%Sa2/d0$^Ixp"|dc`;s/\W//g;$_=pack('H*',/((..)*)$/)
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html