Messages in this thread | | | Date | Tue, 10 Jan 2006 12:31:18 -0800 (PST) | From | Linus Torvalds <> | Subject | Re: git pull on Linux/ACPI release tree |
| |
On Tue, 10 Jan 2006, Adrian Bunk wrote: > > > Now, in this model, you're not really using git as a distributed system. > > In this model, you're using git to track somebody elses tree, and track a > > few patches on top of it, and then "git rebase" is a way to move the base > > that you're tracking your patches against forwards.. > > I am using the workaround of carrying the patches in a mail folder, > applying them in a batch, and not pulling from your tree between > applying a batch of patches and you pulling from my tree.
Yes, that also works.
I think "quilt" is really the right thing here, although stg may be even easier due to the more direct git integration. But with a smallish number of patches, just doing patch management by hand is obviously simply not a huge problem either, so extra tools may just end up confusing the issue.
Linus - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |