merging question | The Git List

Ian Molton· Jan 30, 2006, 16:23 UTC · lore

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.

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

Peter Eriksen· Jan 30, 2006, 19:14 UTC · re: Ian Molton · lore

Re: merging question

On Mon, Jan 30, 2006 at 04:23:15PM +0000, Ian Molton wrote:

Show 6 quoted lines

> 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