On Fri, Feb 17, 2006 at 08:04:03PM +0100, Jiri Benc wrote: > On Fri, 17 Feb 2006 13:56:39 -0500, John W. Linville wrote: > > I have recreated my tree based off Linus' current (as of last night) > > tree. At least this afforded me the opportunity to do a little > > more clean-up... > > > > For those following wireless-2.6, this means you will have to manually > > rebase once more. I try to avoid this, but it seems to be happening > > a lot lately. Hopefully things will settle soon. > > It seems you have re-comitted everything. I'm worried this means you > won't be able to pull from other trees (like mine or Michael Buesch's > one). Or am I wrong and git can handle this?
I was going to send a message about this, but you beat me to it... I am hoping to persuade you, Michael, Johannes, and anyone else with a tree I don't know about to rebase your trees off my current tree so that I can continue to pull cleanly. :-) The process should not be too painful. If you are not familiar with them, I would refer you to git-format-patch and git-applymbox. The first allows you to extract a series of patches into an mbox formatted file. You then can edit/delete any patches that might already be in the wireless-2.6 tree. Then, git-applymbox can be used to apply the series of patches back to the new tree. If you choose not to do that, then I suppose I will have to replicate that process locally. Or, I'll have to insist on you sending patches to me. Either of those are likely to result in more delays for your patches than if you were to rebase and allow me to pull cleanly. I appreciate your cooperation in this. I assure you that I am working to minimize the chances of needing to do this again. Thanks, John P.S. If you think I'm bad, you should try following davem's net-2.6.17 tree... :-) -- John W. Linville [EMAIL PROTECTED] - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
