From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH] merge-recursive: introduce merge_options Date: Wed, 27 Aug 2008 21:50:02 -0700 Message-ID: <7v8wuhiw05.fsf@gitster.siamese.dyndns.org> References: <7v7ia5iq7l.fsf@gitster.siamese.dyndns.org> <1219674357-31000-1-git-send-email-vmiklos@frugalware.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org, Stephan Beyer To: Miklos Vajna X-From: git-owner@vger.kernel.org Thu Aug 28 06:51:32 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KYZTh-0006Sb-DE for gcvg-git-2@gmane.org; Thu, 28 Aug 2008 06:51:25 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750836AbYH1EuK (ORCPT ); Thu, 28 Aug 2008 00:50:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750797AbYH1EuK (ORCPT ); Thu, 28 Aug 2008 00:50:10 -0400 Received: from a-sasl-fastnet.sasl.smtp.pobox.com ([207.106.133.19]:52996 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750784AbYH1EuJ (ORCPT ); Thu, 28 Aug 2008 00:50:09 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by a-sasl-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTP id D57E053D35; Thu, 28 Aug 2008 00:50:07 -0400 (EDT) Received: from pobox.com (ip68-225-240-211.oc.oc.cox.net [68.225.240.211]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by a-sasl-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTPSA id 29B1853D2F; Thu, 28 Aug 2008 00:50:04 -0400 (EDT) User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-Pobox-Relay-ID: C9C22C6E-74BC-11DD-868B-9EE598D589B0-77302942!a-sasl-fastnet.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Miklos Vajna writes: > On Sun, Aug 24, 2008 at 11:06:06PM -0700, Junio C Hamano wrote: >> Miklos Vajna writes: >> >> > 1) This applies on top of 1c868d4 (merge-recursive.c: Add more >> > generic merge_recursive_generic()). I can rebase this (along with >> > 1c868d4 and 1c868d4^) on top of current master, if this is a problem. >> >> It probably is cleaner to treat this as a fresh topic from scratch on >> top of 'master', as we do not have anything outstanding in 'next' >> around this area. > > I'm now confused about what should I do: > > 1) Nothing. (That's what I did for now.) > > 2) Rebase against master and resend. > > 3) Rebase, squash and resend. What I meant was that the final state after applying this patch may make what "git log master..1c868d4" currently shows (there are two patches if I recall correctly) an incomplete failed experiment, in which case squashing and possibly refactoring (if the result of squashing is too messy) would make the history easier to review. But I looked at the series again after rebasing them myself. If you want to clean-it-up, you could replace them by sending in updates to refactor them. I think they are still ugly, even though the end result is tolerable ;-)