From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [RFC/PATCH] Add git-unresolve ... Date: Wed, 19 Apr 2006 15:48:22 -0700 Message-ID: <7vk69l5gi1.fsf@assigned-by-dhcp.cox.net> References: <7vu08p72sn.fsf@assigned-by-dhcp.cox.net> <87acah6zk6.wl%cworth@cworth.org> <7v8xq16y31.fsf@assigned-by-dhcp.cox.net> <87wtdl2o5o.wl%cworth@cworth.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Apr 20 00:48:34 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FWLTJ-00054c-Hy for gcvg-git@gmane.org; Thu, 20 Apr 2006 00:48:30 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751294AbWDSWsZ (ORCPT ); Wed, 19 Apr 2006 18:48:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751304AbWDSWsY (ORCPT ); Wed, 19 Apr 2006 18:48:24 -0400 Received: from fed1rmmtao01.cox.net ([68.230.241.38]:59870 "EHLO fed1rmmtao01.cox.net") by vger.kernel.org with ESMTP id S1751294AbWDSWsY (ORCPT ); Wed, 19 Apr 2006 18:48:24 -0400 Received: from assigned-by-dhcp.cox.net ([68.4.9.127]) by fed1rmmtao01.cox.net (InterMail vM.6.01.06.01 201-2131-130-101-20060113) with ESMTP id <20060419224823.WKL24981.fed1rmmtao01.cox.net@assigned-by-dhcp.cox.net>; Wed, 19 Apr 2006 18:48:23 -0400 To: Carl Worth In-Reply-To: <87wtdl2o5o.wl%cworth@cworth.org> (Carl Worth's message of "Wed, 19 Apr 2006 15:31:15 -0700") User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/21.4 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Carl Worth writes: > Meanwhile, I still think it's worth re-considering the original > problem. Maybe you are misunderstanding something in a major way,... > After a failed merge, I get a multi-parent diff from "git > diff". However, after updating the index, I can't find any way to get > multi-parent diffs anymore. ... and that is exactly what this "unmerge to re-populate higher order stages" does. The multi-parent diff you have been looking at failed merge _is_ generated by comparing the higher order stages and your working tree file. > I'd still like to be able to do that, even when I know that what I > have in the index is good, and I don't want to undo it. You cannot it have both ways. Either you want to have the unmerged entries (so that you *can* view the combined diff), or you do not want to have them (then you obviously cannot view the combined diff between the working tree file and these stages).