From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Torvalds Subject: Re: merge strategy request Date: Sat, 24 Mar 2007 21:31:45 -0700 (PDT) Message-ID: References: Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: David Lang , git@vger.kernel.org To: Johannes Schindelin X-From: git-owner@vger.kernel.org Sun Mar 25 06:32:07 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1HVKOk-0000Al-PC for gcvg-git@gmane.org; Sun, 25 Mar 2007 06:32:07 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965095AbXCYEb4 (ORCPT ); Sun, 25 Mar 2007 00:31:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965164AbXCYEbz (ORCPT ); Sun, 25 Mar 2007 00:31:55 -0400 Received: from smtp.osdl.org ([65.172.181.24]:58752 "EHLO smtp.osdl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965095AbXCYEby (ORCPT ); Sun, 25 Mar 2007 00:31:54 -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 l2P4Vk1o018397 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Sat, 24 Mar 2007 21:31:46 -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 l2P4VjtQ020535; Sat, 24 Mar 2007 21:31:46 -0700 In-Reply-To: X-Spam-Status: No, hits=-0.473 required=5 tests=AWL X-Spam-Checker-Version: SpamAssassin 2.63-osdl_revision__1.119__ X-MIMEDefang-Filter: osdl$Revision: 1.177 $ X-Scanned-By: MIMEDefang 2.36 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On Sun, 25 Mar 2007, Johannes Schindelin wrote: > > Basically, just write a program named "git-merge-david-lang", which takes > arguments of the form > > merge-base [merge-base2...] -- head remote [remote...] I think you are missing what David wants. David does *not* want a new global strategy. Adding those is fairly easy. David seem sto want a new per-file merge strategy, with the bog-standard recursive merge. We've talked about that possibility in the past, but we don't do it now. We always end up doing just the three-way merge. Linus