On Fri, 28 Oct 2011, Greg KH wrote: > > I've been trying to figure out a way to reproduce what you used to > > have, where the gregkh-usb-*.patch file would apply on top of the > > current -rc tree. It looks like the only equivalent using git is to > > merge the two branches, as you say. > > Yes, that's the way. > > Hopefully, it's even easier for you to do this now, than before. > > I'd recommend (and this is what I do on my machines), doing something > like this: > > - clone the usb.git tree > - create the usb-next tracking branch: > git checkout -t -b usb-next origin/usb-next > - create the usb-linus tracking branch: > git checkout -t -b usb-linus origin/usb-linus > - checkout one of them: > git checkout usb-linus > - create your branch to do stuff on: > git checkout -b work > > Now you have a branch called "work" that was based off of usb-linus. > Update things so that you have a merge of the two: > - git checkout work > - git merge usb-linus > - git merge usb-next > hopefully there were no conflicts, and now you have the merge of the > two. > > As time goes on, you can just live on this work branch, making new > changes and sending them to me. When I update my branches, you can > update yours: > - git checkout usb-linus > - git pull > - git checkout usb-next > - git pull > [note, I think there's an easier way to fetch the updates from > "upstream" and update the branches, but I can't remember it at the > moment.] Probably it isn't necessary to create the local usb-linus and usb-next branches. origin/usb-linus and origin/usb-next should work just as well. Then instead of "git pull", "git fetch" would be enough, or maybe "git fetch --all". > Then check your branch out again: > - git checkout work > and merge: > - git merge usb-linus > - git merge usb-next > > and all should be good. > > Does that help out? Thanks for the detailed instructions. I'll try it out. Alan Stern -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
