From: Catalin Marinas Date: Mon, 23 Oct 2006 11:52:20 GMT Subject: Re: [PATCH 1/2] New stg command: assimilate Message-ID: In-Reply-To: <20061022181256.GA30295@diana.vm.bytemark.co.uk> On 22/10/06, Karl Hasselström wrote: > On 2006-10-22 19:43:08 +0200, Petr Baudis wrote: > > > Dear diary, on Sun, Oct 22, 2006 at 03:08:02PM CEST, I got a letter > > where Karl Hasselström said that... > > > > > Introduce an "assimilate" command, with no options. It takes any > > > GIT commits committed on top of your StGIT patch stack and > > > converts them into StGIT patches. > > > > Hmm, isn't this what stg uncommit does? > > > > Well, I'm not sure if what uncommit takes is from below the stack or > > above the stack, but if it's the former, it would still IMHO make > > more sense to just tell that StGIT with a switch or something. > > Yes, you're correct in that uncommit and assimilate add existing > commits to the StGIT stack, but in different ends: uncommit grows the > stack by incorporating commits that precede it, while assimilate grows > the stack by incorporating commits that follows it. I think I also prefer a separate command for this as they have slightly different goals and users could easily confuse the options of a more powerful 'uncommit'. -- Catalin