Re: merging initial part of a branch?

From: Andreas Ericsson <ae@op5.se>
Date: Jan 12, 2006, 00:59 UTC
Message-ID: <43C5A9F4.1040604@op5.se>
In-Reply-To: <7vu0cai98f.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano wrote:

Show 22 quoted lines

> Andreas Ericsson <ae@op5.se> writes:
> 
> 
>>Junio C Hamano wrote:
>>
>>
>>>I haven't tried this for some time, but I presume
>>>	$ git pull linus tag v2.6.15
>>>would do what you want.
>>
>>If it doesn't you might be able to do
>>
>>$ git format-patch -m -k v2.6.14..v2.6.15 --stdout > mega-mbox-patch
>>$ git checkout our-own-branch
>>$ git am -3 -k mega-mbox-patch
>>
>>That'll take some time though, so be sure to have a six-pack or two handy.
> 
> 
> I do not think that should be done.  You will create an
> alternate history that way, not the true v2.6.15 history.
>

I took their request to mean that they already have patches of their own in that, so they'll never have v2.6.15 vanilla history anyway.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231