Jeff King <peff@xxxxxxxx> wrote: > > Do you need to keep the modifications you make on top of upstream as a > nice, clean series of rebased patches? If not, then you can avoid the > repeated rebasing, and just use a more traditional topic-branch > workflow. Treat modifications from upstream as just another topic. Thanks for the suggestion! Our aim is to get as many patches into the upstream version as we can, which is why my starting point is a clean rebased patch series. I am also thinking that this will help me to know when a patch can be dropped from the series because upstream have incorporated something like it. If upstream works like git upstream (incorporating patches verbatim after they pass review) then git can handle this automatically, but if the patch gets re-worked it might be easier for me to drop it when rebasing rather than resolve conflicts. I'm also thinking that for packages which we update relatively infrequently, having a clean patch series makes it easier to review whether they are all still necessary when updating. But perhaps I am too wedded to manual patch management... Tony. -- f.anthony.n.finch <dot@xxxxxxxx> http://dotat.at/ Forties, Cromarty: East, veering southeast, 4 or 5, occasionally 6 at first. Rough, becoming slight or moderate. Showers, rain at first. Moderate or good, occasionally poor at first. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html