{"thread":{"id":"3193","subject":"merging question","startedAt":"2006-01-30T16:23:15Z","lastAt":"2006-01-30T19:14:24Z","messageCount":2,"participants":["Ian Molton","Peter Eriksen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"15263","messageId":"43DE3D73.60904@f2s.com","threadId":"3193","inReplyTo":null,"subject":"merging question","fromName":"Ian Molton","fromEmail":"spyro@f2s.com","sentAt":"2006-01-30T16:23:15Z","receivedAt":"2006-01-30T16:23:15Z","isPatch":false,"sender":{"key":"spyro@f2s.com","avatar":null},"body":"Is it possible to merge all the changes up to a specific tagged version \nof another branch ?\n\nI'd like to pull all the changes up to 2.6.15 into a branch created from \n2.6.12, which has been subsequently modified. I dont yet want to pull \nlater changes in.\n\non a side note, how does one pull in an individual changeset, rather \nthan the head of an entire branch ?\n"},{"id":"15271","messageId":"20060130191424.GA15953@ebar091.ebar.dtu.dk","threadId":"3193","inReplyTo":"43DE3D73.60904@f2s.com","subject":"Re: merging question","fromName":"Peter Eriksen","fromEmail":"s022018@student.dtu.dk","sentAt":"2006-01-30T19:14:24Z","receivedAt":"2006-01-30T19:14:24Z","isPatch":false,"sender":{"key":"s022018@student.dtu.dk","avatar":null},"body":"On Mon, Jan 30, 2006 at 04:23:15PM +0000, Ian Molton wrote:\n> Is it possible to merge all the changes up to a specific tagged version \n> of another branch ?\n> \n> I'd like to pull all the changes up to 2.6.15 into a branch created from \n> 2.6.12, which has been subsequently modified. I dont yet want to pull \n> later changes in.\n\nThis is what I tried to do, and it seems to work:\n\ngit checkout -b mywork v2.6.12\n# work, work, work\ngit commit -a\ngit merge \"Merging happily.\" mywork v2.6.15\n\nThe man pages can explain it better than I can.\n\n> on a side note, how does one pull in an individual changeset, rather \n> than the head of an entire branch ?\n\nLook into git-cherry and git-cherry-pick.\n\nRegards,\n\nPeter\n"}]}