From: Junio C Hamano Date: Fri, 19 Sep 2008 20:28:15 GMT Subject: Re: [PATCH] Documentation: warn against merging in a dirty tree Message-ID: <7vljxnswww.fsf@gitster.siamese.dyndns.org> In-Reply-To: Linus Torvalds writes: > That said, it's actually kind of sad that we don't expose a real > capability that the git plumbing does have. Namely > > git read-tree -u -m HEAD ORIG_HEAD I do not think this is quite enough. "read-tree --reset -u" is probably closer, but it may discard the entries added (and got conflicted) by the merge before actually updating the working tree (the right thing there would be to remove them).