From: Petr Baudis Date: Tue, 01 Nov 2005 09:17:11 GMT Subject: Re: git versus CVS (versus bk) Message-ID: <20051101091710.GC11618@pasky.or.cz> In-Reply-To: <20051101012915.GR11488@ca-server1.us.oracle.com> Dear diary, on Tue, Nov 01, 2005 at 02:29:15AM CET, I got a letter where Joel Becker told me that... > On Tue, Nov 01, 2005 at 02:02:43PM +1300, Martin Langhoff wrote: > > I'm really surprised that Calalin hasn't chimed in. If you are into > > rewriting/merging/splitting your patches, StGIT is your friend. Check > > out: http://www.procode.org/stgit/ > > But I'm not. I don't want patches in the first place. I want > cg-pull but with a flattened history. StGIT does not work with patches but with commits. You can manage the logical changes with StGIT and when it's time, just merge your StGIT-tracked branch with whatever else. "Patch" here is really just a different name for logical change / commit. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ VI has two modes: the one in which it beeps and the one in which it doesn't.