From: Peter Eriksen <s022018@student.dtu.dk>
Date: Mon, 30 Jan 2006 19:14:24 GMT
Subject: Re: merging question
Message-ID: <20060130191424.GA15953@ebar091.ebar.dtu.dk>
In-Reply-To: <43DE3D73.60904@f2s.com>

On Mon, Jan 30, 2006 at 04:23:15PM +0000, Ian Molton wrote:
> Is it possible to merge all the changes up to a specific tagged version 
> of another branch ?
> 
> I'd like to pull all the changes up to 2.6.15 into a branch created from 
> 2.6.12, which has been subsequently modified. I dont yet want to pull 
> later changes in.

This is what I tried to do, and it seems to work:

git checkout -b mywork v2.6.12
# work, work, work
git commit -a
git merge "Merging happily." mywork v2.6.15

The man pages can explain it better than I can.

> on a side note, how does one pull in an individual changeset, rather 
> than the head of an entire branch ?

Look into git-cherry and git-cherry-pick.

Regards,

Peter