how to merge...

From: Ian Molton <spyro@f2s.com>
Date: 2006-01-30 23:25:13
Hi...

Well, I've got the basics of importing patches from outside git now, so 
the next question is...

suppose I've aplpied the 2.6.16-rc1-mm3 patch into its own branch in my 
local git repo.

I've also created an arm26 branch from the master 2.6.16-rc1.

I want to pull some patches from the -mm3 branch into the arm26 one, as 
a single change.

Obviously, I could simply make a diff including just those files and 
apply it to my arm26 branch, but I'd prefer not to if theres a better 
way that allows git to keep track of what really happened.

Presumably the 'correct' fix is to import the broken up -mm patchset so 
git can pull only the changes relating to those files, but since Im 
learning and not everyone provides broken up patchsets, it'd be nice to 
know if theres a way to do it 'the hard way'.

Cheers!
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Mon Jan 30 23:21:59 2006

This archive was generated by hypermail 2.1.8 : 2006-01-30 23:22:09 EST