On Tue, 2006-03-28 at 18:26 -0800, Junio C Hamano wrote: > v2.6.15 v2.6.16 > ---o---o---o---...---o---o > \ \ > \ y---y---y 2.6.16-matt > \ > o---o---o v2.6.15.6 > \ > x---x---x 2.6.15.6-matt > > to happen, where y---y---y are analogous to x---x---x. > > Assuming your branches are: > > origin - v2.6.15.6 (from stable team) > master - your changes (2.6.15.6-matt) Beautiful diagram. This is exactly my situation. > you could: > > $ git fetch git://../torvalds/linux-2.6.git tag v2.6.16 > $ git checkout -b 2.6.16-matt v2.6.16 > $ git format-patch origin master | git am -3 This looks like what I want. When I run the third command, however, I get "no patch found". Four files corresponding to my four commits appear in my repository; I have attached them. What is wrong? > Alternatively, you might want to do a real merge: > [...] If you do not understand > what the stable team did in order to reimplement certain fixes, > you would have a very difficult time deciding on how to resolve > conflicts with this merge. Yes, I think this is the problem what I ran into before when I was trying to pull. Perhaps this is just politics, but which kernel repository is more official, and why? Linus's or the one I have been using, git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.16.y.git ? Thanks for the help! -- Matt McCutchen hashproduct@verizon.net http://hashproduct.metaesthetics.net/Received on Thu Mar 30 14:02:31 2006
This archive was generated by hypermail 2.1.8 : 2006-03-30 14:02:46 EST