From: "Shawn O. Pearce" <spearce@spearce.org>
To: Pierre Habouzit <madcoder@debian.org>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] parse-opt: migrate fmt-merge-msg.
Date: Tue, 30 Sep 2008 15:46:23 -0700 [thread overview]
Message-ID: <20080930224623.GQ21310@spearce.org> (raw)
In-Reply-To: <20080930211643.GA16879@artemis.corp>
Pierre Habouzit <madcoder@debian.org> wrote:
> On Tue, Sep 30, 2008 at 07:10:14PM +0000, Shawn O. Pearce wrote:
> > Pierre Habouzit <madcoder@debian.org> wrote:
> > > On Mon, Sep 29, 2008 at 04:35:23PM +0000, Shawn O. Pearce wrote:
> > > > Pierre Habouzit <madcoder@debian.org> wrote:
> > > > > Also fix an inefficient printf("%s", ...) where we can use write_in_full.
> >
> > I'd appreciate an updated series if you can send it. am -3 isn't
> > "easily" applying it.
>
> Okay, I will then, but FWIW it means that when you'll try to merge this
> in next it'll conflict at that time, so I'm not sure there's a huge win
> for you at that point.
It may actually be a good idea to rebase this against master.
Reading Junio's notes for sg/merge-options (the branch this conflict
is coming out of) it sounds like we'd want to revert that anyway.
Its been around since April and Junio was talking about it needing
to be in a 1.7.0 release. Its not going to graduate anytime soon.
IOW I'm quite tempted to revert sg/merge-options and cancel the
branch out of next.
--
Shawn.
next prev parent reply other threads:[~2008-09-30 22:47 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-28 9:45 small warm-up: easy parse-opt migrations Pierre Habouzit
2008-09-28 9:45 ` [PATCH] parse-opt: migrate fmt-merge-msg Pierre Habouzit
2008-09-28 9:45 ` [PATCH] parse-opt: migrate git-merge-base Pierre Habouzit
2008-09-28 9:45 ` [PATCH] parse-opt: migrate builtin-merge-file Pierre Habouzit
2008-09-29 16:35 ` [PATCH] parse-opt: migrate fmt-merge-msg Shawn O. Pearce
2008-09-30 8:40 ` Pierre Habouzit
2008-09-30 19:10 ` Shawn O. Pearce
2008-09-30 21:16 ` Pierre Habouzit
2008-09-30 22:46 ` Shawn O. Pearce [this message]
2008-10-01 6:05 ` [PATCH 1/3] " Pierre Habouzit
2008-10-01 6:05 ` [PATCH 2/3] parse-opt: migrate git-merge-base Pierre Habouzit
2008-10-01 6:05 ` [PATCH 3/3] parse-opt: migrate builtin-merge-file Pierre Habouzit
2008-10-01 15:01 ` Shawn O. Pearce
2008-10-01 14:56 ` [PATCH 1/3] parse-opt: migrate fmt-merge-msg Shawn O. Pearce
2008-10-02 11:51 ` Pierre Habouzit
2008-10-02 12:59 ` [RESEND PATCH] " Pierre Habouzit
2008-10-02 12:59 ` [PATCH] parse-opt: migrate git-merge-base Pierre Habouzit
2008-10-02 12:59 ` [RESEND PATCH] parse-opt: migrate builtin-merge-file Pierre Habouzit
2008-09-28 13:20 ` small warm-up: easy parse-opt migrations Sverre Rabbelier
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=20080930224623.GQ21310@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=madcoder@debian.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.