* merging question
@ 2006-01-30 16:23 Ian Molton
2006-01-30 19:14 ` Peter Eriksen
0 siblings, 1 reply; 2+ messages in thread
From: Ian Molton @ 2006-01-30 16:23 UTC (permalink / raw)
To: git
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 ?
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: merging question
2006-01-30 16:23 merging question Ian Molton
@ 2006-01-30 19:14 ` Peter Eriksen
0 siblings, 0 replies; 2+ messages in thread
From: Peter Eriksen @ 2006-01-30 19:14 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-01-30 19:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-01-30 16:23 merging question Ian Molton
2006-01-30 19:14 ` Peter Eriksen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).