Re: [PATCH v2 4/3] gitweb: Always call format_date with timezone parameter

From: Jakub Narebski <jnareb@gmail.com>
Date: Mar 20, 2011, 11:07 UTC
Message-ID: <201103201207.56639.jnareb@gmail.com>
In-Reply-To: <201103201137.18619.jnareb@gmail.com>

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