* how to merge...
@ 2006-01-30 12:25 Ian Molton
0 siblings, 0 replies; only message in thread
From: Ian Molton @ 2006-01-30 12:25 UTC (permalink / raw)
To: git
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!
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-01-30 12:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-01-30 12:25 how to merge Ian Molton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.