On Tue, Dec 04, 2007 at 03:29:30PM +0000, David Woodhouse wrote: > Basically, trees which get rebased aren't suitable for git users to base > their work on. It just doesn't work. Well I think that is an overstatement, but you are entitled to it... :-) I don't know what else I can offer. There may be some ways to rebase 'everything' less often, but I don't think I can eliminate it completely without having a big mess. > Which is why I thought we'd agreed that I'll commit libertas-related > stuff to libertas-2.6.git for now, where Holger and I can play to our > hearts' content, then ask you to pull when we're done. I just don't see where I have upset that apple cart. Polish-up your tree and I'll pull it. I (or maybe we) will work it out from there. Again, I don't have any more libertas patches in queue. So don't send any more until you are ready to merge and I don't think there will be a serious problem. > I'm open to better suggestions, as long as they're not "you are not > allowed to use git, except as a primitive way of storing patches". :) Keeping a clean patch stack at the top is the only way I know to come close to guaranteeing you have mergeable patches. Beyond that, I'll work with you the best that I can. John -- John W. Linville linville@xxxxxxxxxxxxx - To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
