From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Avery Pennarun" Subject: [PATCH 0/8] The return of -Xours, -Xtheirs, -Xsubtree=dir Date: Wed, 25 Nov 2009 21:23:52 -0500 Message-ID: Cc: , "Avery Pennarun" To: X-From: git-owner@vger.kernel.org Thu Nov 26 03:42:55 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1NDUJq-0004jY-Dr for gcvg-git-2@lo.gmane.org; Thu, 26 Nov 2009 03:42:54 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753999AbZKZCmc (ORCPT ); Wed, 25 Nov 2009 21:42:32 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753727AbZKZCmc (ORCPT ); Wed, 25 Nov 2009 21:42:32 -0500 Received: from mailhost.pwcorp.com ([216.13.111.70]:4746 "EHLO mailhost.pwcorp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753414AbZKZCmb (ORCPT ); Wed, 25 Nov 2009 21:42:31 -0500 X-Greylist: delayed 912 seconds by postgrey-1.27 at vger.kernel.org; Wed, 25 Nov 2009 21:42:31 EST thread-index: AcpuP/gthWfSUtuQRFOaWnOartUYJg== X-Language-Identified: TRUE X-Brightmail-Tracker: AAAAAQAAA+k= Content-Class: urn:content-classes:message Importance: normal Received: from weaver.open.versabanq.com ([10.65.1.2]) by mailhost.pwcorp.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 25 Nov 2009 21:26:41 -0500 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.3790.4325 Received: (qmail 5444 invoked from network); 26 Nov 2009 02:25:33 -0000 Received: from unknown (HELO harmony.mtl.versabanq.com) (10.65.1.133) by weaver.open.versabanq.com with SMTP; 26 Nov 2009 02:25:33 -0000 Received: by harmony.mtl.versabanq.com (sSMTP sendmail emulation); Wed, 25 Nov 2009 21:24:08 -0500 X-Mailer: git-send-email 1.6.6.rc0.62.gaccf X-OriginalArrivalTime: 26 Nov 2009 02:26:41.0168 (UTC) FILETIME=[E376A900:01CA6E3F] Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: As discussed earlier today, this brings back Junio's earlier patch series that introduced (and then used) a -X option for configuring merge strategies. My favourite use of this is -Xsubtree=, which lets you provide the actual subdir prefix when using the subtree merge strategy. Avery Pennarun (8): git-merge-file --ours, --theirs builtin-merge.c: call exclude_cmds() correctly. git-merge-recursive-{ours,theirs} Teach git-merge to pass -X