From: Dun Peal <dunpealer@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Git ML <git@vger.kernel.org>
Subject: Re: Can `add --patch` display the diff in my difftool instead of just printing it on the command line?
Date: Tue, 14 Dec 2010 16:22:27 -0600 [thread overview]
Message-ID: <AANLkTimV3eQuLcUcoTHWOeXCNoGoboSggkVfoxvVcx8X@mail.gmail.com> (raw)
In-Reply-To: <20101214213810.GB2216@sigill.intra.peff.net>
On Tue, Dec 14, 2010 at 3:38 PM, Jeff King <peff@peff.net> wrote:
> You can't do this with "git add -p" now, but I suspect the patch would
> be relatively straightforward. See patch_update_file in
> git-add--interactive.perl. You just need to replace:
>
> for (@{$head->{DISPLAY}}) {
> print;
> }
>
> with code to dump the diff in @{$head->{TEXT}} either to stdin of your
> display program or to a tempfile that your program operates on.
> Conditional on having some config option to specify your program, of
> course.
That's exactly what I want, thanks. Seems like there should be a flag
/ config that tells `add --interactive` to render the diffs through a
difftool. I know several Git users who always use their difftools for
large, complex patches, which are exactly the kind of patches you'd
manage with --interactive / --patch. Hope one of you Git bigwigs takes
the time to add that feature :-)
.D
prev parent reply other threads:[~2010-12-14 22:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-14 21:17 Can `add --patch` display the diff in my difftool instead of just printing it on the command line? Dun Peal
2010-12-14 21:38 ` Jeff King
2010-12-14 22:22 ` Dun Peal [this message]
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=AANLkTimV3eQuLcUcoTHWOeXCNoGoboSggkVfoxvVcx8X@mail.gmail.com \
--to=dunpealer@gmail.com \
--cc=git@vger.kernel.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).