{"thread":{"id":"3189","subject":"how to merge...","startedAt":"2006-01-30T12:25:13Z","lastAt":"2006-01-30T12:25:13Z","messageCount":1,"participants":["Ian Molton"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"15253","messageId":"43DE05A9.90804@f2s.com","threadId":"3189","inReplyTo":null,"subject":"how to merge...","fromName":"Ian Molton","fromEmail":"spyro@f2s.com","sentAt":"2006-01-30T12:25:13Z","receivedAt":"2006-01-30T12:25:13Z","isPatch":false,"sender":{"key":"spyro@f2s.com","avatar":null},"body":"Hi...\n\nWell, I've got the basics of importing patches from outside git now, so \nthe next question is...\n\nsuppose I've aplpied the 2.6.16-rc1-mm3 patch into its own branch in my \nlocal git repo.\n\nI've also created an arm26 branch from the master 2.6.16-rc1.\n\nI want to pull some patches from the -mm3 branch into the arm26 one, as \na single change.\n\nObviously, I could simply make a diff including just those files and \napply it to my arm26 branch, but I'd prefer not to if theres a better \nway that allows git to keep track of what really happened.\n\nPresumably the 'correct' fix is to import the broken up -mm patchset so \ngit can pull only the changes relating to those files, but since Im \nlearning and not everyone provides broken up patchsets, it'd be nice to \nknow if theres a way to do it 'the hard way'.\n\nCheers!\n"}]}