Re: cherry-pick --since ?

From: Junio C Hamano <junkio@cox.net>
Date: Apr 20, 2007, 23:05 UTC
Message-ID: <7v647qy7dn.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.64.0704201100050.4667@torch.nrlssc.navy.mil>

Brandon Casey <casey@nrlssc.navy.mil> writes:

Show 15 quoted lines

> Is there functionality to allow something akin to
> a
>    git cherry-pick --since <commit>
>
> or maybe syntax similar to git cherry where the upstream, head,
> and limit can be specified. Or the .. syntax would work.
>
>
> Here's my use case:
>
> Two branches, 'A' and 'B'.
> 'A' is the master branch.
> 'B' was forked some time ago and is in bug fix only mode.
> Much of 'A' and 'B' are still the same, but there have been
>   some intrusive changes made to 'A' that should not go into 'B'.

You forgot to say "My objective is to make sure all the good fixes in B are forward ported to A" but I am assuming that is the case.

>   This is also why I can't just pull from 'B'. rebase may work,
>   but then of course all of the commit id's change.

I do not understand why you cannot merge 'B' into 'A'. From the commit ancestry perspective, merging is exactly the right thing to do if your goal is to forward port all fixes in B to A.