From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Date: Tue, 12 Feb 2008 16:44:47 -0800 (PST) > gitk --merge ... > This is something where I actually think git could and should do better: > git has the capability to act as more of a "quilt replacement", but > because it wasn't part of the original design, we never actualy exposed > the simple queue management commands to do this (stgit does things like > that, though). > > So if you haven't pushed out, right now you'd have to do this stupid > thing: Thanks for all the useful info. But as soon as I've applied any patches to my tree I've "pushed out". So this scheme doesn't work for me. The first thing I do when I have changes to apply is clone a tree locally and on master.kernel.org, then I apply that first patch locally and push it out to master. What would be really cool is if you could do the rebase thing, push that to a remote tree you were already pushing into and others could pull from that and all the right things happen. A rebase is just a series of events, and those could propagate to people who are pulling from the tree. I'm pretty sure GIT could support this. - To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html