From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Torokhov Subject: Re: LCA2006 Git/Cogito tutorial Date: Thu, 20 Oct 2005 21:37:21 -0500 Message-ID: <200510202137.22311.dtor_core@ameritech.net> References: <4352F4C9.1040703@catalyst.net.nz> <20051021005145.GB30889@pasky.or.cz> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Petr Baudis , "Martin Langhoff (CatalystIT)" X-From: git-owner@vger.kernel.org Fri Oct 21 04:38:54 2005 Return-path: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1ESmmz-0001fe-He for gcvg-git@gmane.org; Fri, 21 Oct 2005 04:37:49 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964844AbVJUCh3 convert rfc822-to-quoted-printable (ORCPT ); Thu, 20 Oct 2005 22:37:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964845AbVJUCh3 (ORCPT ); Thu, 20 Oct 2005 22:37:29 -0400 Received: from smtp110.sbc.mail.re2.yahoo.com ([68.142.229.95]:14685 "HELO smtp110.sbc.mail.re2.yahoo.com") by vger.kernel.org with SMTP id S964844AbVJUCh3 convert rfc822-to-8bit (ORCPT ); Thu, 20 Oct 2005 22:37:29 -0400 Received: (qmail 56900 invoked from network); 21 Oct 2005 02:37:28 -0000 Received: from unknown (HELO mail.corenet.homeip.net) (dtor?core@ameritech.net@70.236.40.196 with login) by smtp110.sbc.mail.re2.yahoo.com with SMTP; 21 Oct 2005 02:37:27 -0000 To: git@vger.kernel.org User-Agent: KMail/1.8.3 In-Reply-To: <20051021005145.GB30889@pasky.or.cz> Content-Disposition: inline Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On Thursday 20 October 2005 19:51, Petr Baudis wrote: > (ii) You say: >=20 > =A0=A0=A0=A0=A0=A0=A0=A0- Very fast stupid merge > =A0=A0=A0=A0=A0=A0=A0=A0 =A0 =A0... and very smart, slow merges when = stupid won't do >=20 He might be referring to manual merge which is indeed as smart as it ge= ts :) --=20 Dmitry