From: Petr Baudis Date: Tue, 08 Nov 2005 12:04:26 GMT Subject: Re: git versus CVS (versus bk) Message-ID: <20051108120426.GB1431@pasky.or.cz> In-Reply-To: <200511081150.10867.Josef.Weidendorfer@gmx.de> Dear diary, on Tue, Nov 08, 2005 at 11:50:10AM CET, I got a letter where Josef Weidendorfer told me that... > On Monday 07 November 2005 23:56, Petr Baudis wrote: > > Dear diary, on Tue, Nov 01, 2005 at 10:15:33AM CET, I got a letter > > where Petr Baudis told me that... > > > That said, with a big warning, I would be willing to do something like > > > cg-merge -s and cg-update -s (s as squash) > > ... > > FWIW, cg-merge -s and cg-update -s is supported now. > > The -s option of git merge is about choosing a strategy. > How can I choose the "recursive" strategy with cg-merge? > Some consistency would be good here. Good point. You can't now, but you should be able to in the future. I renamed this from -s to --squash. Thanks, -- 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.