From: Jakub Narebski <jnareb@gmail.com>
To: Kevin Cernekee <cernekee@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH v2 4/3] gitweb: Always call format_date with timezone parameter
Date: Sun, 20 Mar 2011 12:07:55 +0100 [thread overview]
Message-ID: <201103201207.56639.jnareb@gmail.com> (raw)
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
next prev parent reply other threads:[~2011-03-20 11:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-19 20:48 [PATCH v2 1/3] gitweb: rename parse_date() to format_date() Kevin Cernekee
2011-03-19 20:48 ` [PATCH v5 2/3] gitweb: introduce localtime feature Kevin Cernekee
2011-03-19 20:48 ` [PATCH/RFC 3/3] gitweb: change highlighting of "atnight" commits Kevin Cernekee
2011-03-19 22:18 ` [PATCH -1/3] gitweb: Always call parse_date with timezone parameter Jakub Narebski
2011-03-19 22:53 ` [PATCH -1/3 (amend)] " Jakub Narebski
2011-03-19 22:56 ` [PATCH -1/3] " Kevin Cernekee
2011-03-20 0:25 ` Jakub Narebski
2011-03-20 0:27 ` Junio C Hamano
2011-03-20 2:11 ` [PATCH v2 4/3] gitweb: Always call format_date " Kevin Cernekee
2011-03-20 10:37 ` Jakub Narebski
2011-03-20 11:07 ` Jakub Narebski [this message]
2011-03-20 20:47 ` Kevin Cernekee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201103201207.56639.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=cernekee@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).