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 <pasky@suse.cz> 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. Josef - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Tue Nov 08 21:51:26 2005
This archive was generated by hypermail 2.1.8 : 2005-11-08 21:51:30 EST