From: Johannes Schindelin Date: Tue, 02 Jan 2007 20:29:36 GMT Subject: Re: What's cooking in git.git (topics) Message-ID: In-Reply-To: <7vwt4647g0.fsf@assigned-by-dhcp.cox.net> Hi, On Mon, 1 Jan 2007, Junio C Hamano wrote: > * jc/3way (Wed Nov 29 18:53:13 2006 -0800) 1 commit > + git-merge: preserve and merge local changes when doing fast > forward > > Johannes's suggestion to record a tree object instead of LOCAL_DIFF is > roger but not wilco yet --- I haven't thought through the issue to see > an improvement in the suggestion. We will be clobbering both index and > the working tree, and I think "diff --binary HEAD" and "write-tree" > record the equivalent amount of information given a HEAD for recovery. For recovery, yes. The difference comes in - that you can use the familiar git operations to recover (git read-tree PRE_MERGE_TREE), and - that you can do other git operations on the tree, but not on the diff. Hth, Dscho