Managing sub-projects

2016-06-18 Thread Michael Eager
b-projects? Or have I misunderstood one of these schemes? -- Michael Eagerea...@eagercon.com 1960 Park Blvd., Palo Alto, CA 94306 650-325-8077 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info a

Re: Managing sub-projects

2016-06-21 Thread Michael Eager
Hi Stephan! On 06/19/2016 07:01 PM, Stefan Beller wrote: On Sat, Jun 18, 2016 at 4:20 PM, Michael Eager wrote: Any other ways to do what I want without creating a separate forked repo for each of the sub-projects? Or have I misunderstood one of these schemes? I think forking is the way to

Best practices for updating old repos

2017-06-15 Thread Michael Eager
nt approach that I should consider? Or maybe offer advice on how to make one of these approaches work better? What is best practice to update an old repo? -- Michael Eagerea...@eagercon.com 1960 Park Blvd., Palo Alto, CA 94306 650-325-8077

Re: Best practices for updating old repos

2017-06-15 Thread Michael Eager
at 8:52 PM, Michael Eager mailto:ea...@eagerm.com>> wrote: Hi All -- I'm working with code that is based on a five year old repository. There are 130 local commits since the repo was forked. Naturally, the upstream project has moved on significantly. I'm wonderin

Re: Best practices for updating old repos

2017-06-15 Thread Michael Eager
On 06/15/2017 09:22 PM, Stefan Beller wrote: On Thu, Jun 15, 2017 at 5:52 PM, Michael Eager wrote: One other variant of the rebase approach I've thought of is to do this incrementally, rebasing the old repo against an upstream commit a short time after the old repo was forked, fixin