[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 21:36:34 +0200
* Stefano Lattarini wrote on Wed, Jun 23, 2010 at 03:28:59PM CEST:
> At Monday 21 June 2010, Ralf Wildenhues wrote:
> > I'm putting them in a new branch off of maint, and adding the
> > following patch below to fix a couple of nits in them.
> > I'm merging the branch to master for now, might merge to
> > branch-1.11 later as well, I'm not quite sure yet.
> Sorry for nitpicking, but I don't see the branch `sl-yacc-work' (which
> OTHO results merged into master) here:
> nor among those listed with `git branch -r' in a freshly cloned
> Automake git repository.
> Is this intended, or the result of an oversight?
I didn't mean to push the branch, unless it becomes a longer-lived one
which you might want to base work on.
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, too.
Hope that helps.