Jakub Narebski wrote:
> On Sun, 20 Mar 2011, Kevin Cernekee wrote:
> > Rebase on top of my patch 3/3 (as applying -1/3 then 1/3 would create a
> > merge conflict).
>
> You are right, that is better solution.
Well, better for you, as it makes things easier for you: no need to
resolve conflict, or to rerun update script:
$ git checkout HEAD^ -- gitweb/gitweb.perl
$ sed -e 's/\bparse_date\b/\bformat_date\b/' \
<gitweb/gitweb.perl >gitweb/gitweb.perl+ &&
mv -f gitweb/gitweb.perl+ gitweb/gitweb.perl
But it takes bugfix hostage to applying new feature series.
--
Jakub Narebski
Poland
--
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