[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 0/2] Bugfix w.r.t. $(AM_LFLAGS)/$(LFLAGS) and $(AM_YFLAGS)/$(
Re: [PATCH 0/2] Bugfix w.r.t. $(AM_LFLAGS)/$(LFLAGS) and $(AM_YFLAGS)/$(YFLAGS) precedence.
Thu, 24 Jun 2010 22:02:24 +0200
KMail/1.12.1 (Linux/2.6.30-2-686; KDE/4.3.4; i686; ; )
At Thursday 24 June 2010, Ralf Wildenhues wrote:
> I didn't mean to push the branch, unless it becomes a longer-lived
> one which you might want to base work on.
Ah, OK. I misunderstood, and though that you intended to publish the
branch. I'm perfectly fine with not having it in the main repository
(after all, it's basically just a simple bugfix, as you said; and I
have no intention of using it as base for new work).
> Thinking about it, let's just merge it to maint, so far this really
> is purely a bugfix, so branch-1.11 should have it too.
> Generally, if there is some nonpublished branch B that you want to
> base work on, you can usually take the last merge commit C that
> says "merge B" or "merge B to BB" and take C^2 as base:
> git checkout -b B C^2
> That'll recreate the information for you locally. Of course it
> won't automatically update your B from origin/B when that is
> published later, but a quick edit of .git/config can fix that,
And thanks for this additional tips.