From: Jeff King Date: Wed, 23 Aug 2006 14:35:51 GMT Subject: Re: git cherry-pick feature request Message-ID: <20060823143551.GA4592@sigio.intra.peff.net> In-Reply-To: <17644.21269.128308.313284@cargo.ozlabs.ibm.com> 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. -Peff