From: Johannes Schindelin Date: Sun, 31 Dec 2006 15:04:48 GMT Subject: Re: What's cooking in git.git (topics) Message-ID: In-Reply-To: <7vhcvcfpze.fsf@assigned-by-dhcp.cox.net> Hi, On Sun, 31 Dec 2006, 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 > > A few people wanted to have this in v1.5.0, but I am a bit reluctant to > do so --- I think the behaviour of its failure mode is rather nasty, > even though it tries to help the user by dropping the local diff in > .git/LOCAL_DIFF file. I am not urging the inclusion in 1.5.0, but how about storing not the diff, but the _state_ in .git/UNCOMMITTED_TREE? This would work with all the git tools without any problem, and git-gc would eventually clean up older intermediate stages. Ciao, Dscho