From: Junio C Hamano <junkio@cox.net>
Date: Mon, 12 Sep 2005 21:16:48 GMT
Subject: Re: [RFH] Merge driver
Message-ID: <7vmzmi9ebj.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20050912210813.GA6644@c165.ib.student.liu.se>

Fredrik Kuivinen <freku045@student.liu.se> writes:

> git-read-tree A
> git-update-cache --refresh
> git-read-tree -u -m T A B
>
> We need the second step because otherwise git-read-tree will complain
> that the cache isn't uptodate. But we _know_ that the contents are
> uptodate, so the second step is unnecessary and just eats time.

If we _know_ it should match, isn't there a way to tell the
first "git-read-tree A" not to mess with the dirtiness, like,
ah, one-way merge?