From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Torvalds Subject: Re: Merge with git-pasky II. Date: Tue, 26 Apr 2005 15:30:06 -0700 (PDT) Message-ID: References: <200504262336.02583.FabianFranz@gmx.de> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Bram Cohen , git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Apr 27 00:24:55 2005 Return-path: Received: from vger.kernel.org ([12.107.209.244]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DQYSW-0002zO-TI for gcvg-git@gmane.org; Wed, 27 Apr 2005 00:23:13 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261821AbVDZW2Z (ORCPT ); Tue, 26 Apr 2005 18:28:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261823AbVDZW2Z (ORCPT ); Tue, 26 Apr 2005 18:28:25 -0400 Received: from fire.osdl.org ([65.172.181.4]:5594 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S261821AbVDZW2W (ORCPT ); Tue, 26 Apr 2005 18:28:22 -0400 Received: from shell0.pdx.osdl.net (fw.osdl.org [65.172.181.6]) by smtp.osdl.org (8.12.8/8.12.8) with ESMTP id j3QMS8s4032653 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Tue, 26 Apr 2005 15:28:08 -0700 Received: from localhost (shell0.pdx.osdl.net [10.9.0.31]) by shell0.pdx.osdl.net (8.13.1/8.11.6) with ESMTP id j3QMS7kZ014192; Tue, 26 Apr 2005 15:28:07 -0700 To: Fabian Franz In-Reply-To: <200504262336.02583.FabianFranz@gmx.de> X-Spam-Status: No, hits=0 required=5 tests= X-Spam-Checker-Version: SpamAssassin 2.63-osdl_revision__1.35__ X-MIMEDefang-Filter: osdl$Revision: 1.109 $ X-Scanned-By: MIMEDefang 2.36 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org On Tue, 26 Apr 2005, Fabian Franz wrote: > > Am Dienstag, 26. April 2005 23:28 schrieb Bram Cohen: > > Now you've just gone off the deep end. This is an apples-to-apples > > comparison. Please accept one of thee following two statements: > > > > (a) Git doesn't do merging, and none of the related new tools around it do > > merging. > > > > (b) Codeville merge (sans rename functionality) would be superior for the > > merging which will be done. > > I have one very humble question: > > Why don't you write and contribute some code for git to do good merging? Don't bother. Bram doesn't know what he's talking about. Linus