From: Junio C Hamano Date: Thu, 24 Aug 2006 07:29:26 GMT Subject: Re: git cherry-pick feature request Message-ID: <7vmz9ubnhl.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <20060823143551.GA4592@sigio.intra.peff.net> Jeff King writes: > On Wed, Aug 23, 2006 at 11:07:33PM +1000, Paul Mackerras wrote: > >> While I'm asking for features, another one that would be really useful >> for another tool I'm writing is a 3-way diff for a file between the >> working directory, the index, and the current head commit, something >> like what git diff-tree -c does for merges. That is, it would have > > Theoretically I'm working on this, but I haven't really had time to get > started on it yet this week. If you have patience, I'll get to it. If > not, then somebody else is welcome to take a crack at it. It is not entirely related, but I've restarted looking into a parallel tree walker again and will push something in "pu" tonight. It will probably be quite a while until it becomes useful, though. I suspect your approach of internally running run_diff_files() and run_diff_index() and consolidating the result, while it might feel hackish, would be easier at least in the short term.