From: Junio C Hamano <junkio@cox.net>
To: Jeff King <peff@peff.net>
Cc: Paul Mackerras <paulus@samba.org>, git@vger.kernel.org
Subject: Re: git cherry-pick feature request
Date: Thu, 24 Aug 2006 00:29:26 -0700 [thread overview]
Message-ID: <7vmz9ubnhl.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20060823143551.GA4592@sigio.intra.peff.net> (Jeff King's message of "Wed, 23 Aug 2006 10:35:51 -0400")
Jeff King <peff@peff.net> 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.
next prev parent reply other threads:[~2006-08-24 7:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-23 6:29 git cherry-pick feature request Paul Mackerras
2006-08-23 9:51 ` Junio C Hamano
2006-08-23 13:07 ` Paul Mackerras
2006-08-23 14:35 ` Jeff King
2006-08-24 7:29 ` Junio C Hamano [this message]
2006-08-24 7:36 ` Junio C Hamano
2006-08-24 12:54 ` Paul Mackerras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vmz9ubnhl.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=paulus@samba.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).