[Natty] [ti-omap4] [Pull Request]: 2.6.38.2 based updates

[Nicolas Pitre]

On Sat, 16 Apr 2011, Andy Whitcroft wrote:

> On Fri, Apr 15, 2011 at 02:36:03PM -0400, Nicolas Pitre wrote:
> 
> > I don't understand why you guys are going through all this pain of 
> > trying to linearize a Git history in order to transplant it onto another 
> > base.
> 
> We work with rebase trees primarily because you end up with a clean set
> of patches which represent your delta to your base.  If you merge any
> updates required to those patches then appear in your merge commit, and
> all merged together.  That makes ongoing maintenance of your
> non-upstreamable delta much much harder.

Sure.  In that case it is best to keep a branch representing your base 
with all merges happening to it, and have a separate branch containing 
the non-upstreamable patches on top of the base.  Any merges should 
happen in the first branch not the second one.


Nicolas