From: Andreas Ericsson <ae@op5.se>
Date: Thu, 12 Jan 2006 00:15:50 GMT
Subject: Re: merging initial part of a branch?
Message-ID: <43C59FB6.20803@op5.se>
In-Reply-To: <7vek3epbs9.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano wrote:
> "J. Bruce Fields" <bfields@fieldses.org> writes:
> 
> 
>>External kernel projects sometimes work only against major
>>releases--it's easier for their users/testers to find a major release
>>than a random git version, and at least in the early prototype stage, it
>>isn't critical to be working on the tip all the time.
>>
>>Is there a simple way to say, for example, "merge in all the upstream
>>changes up to v2.6.15"?
> 
> 
> 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.

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