From: Jeff King <peff@peff.net>
To: Wincent Colaiuta <win@wincent.com>
Cc: Toby White <tow21@cam.ac.uk>, git@vger.kernel.org
Subject: Re: Using Filemerge.app as a git-diff viewer
Date: Wed, 21 Nov 2007 08:04:46 -0500 [thread overview]
Message-ID: <20071121130446.GA18414@sigill.intra.peff.net> (raw)
In-Reply-To: <1A9343EE-BB45-4CF8-9F17-E6A73C5F0B83@wincent.com>
On Wed, Nov 21, 2007 at 01:59:37PM +0100, Wincent Colaiuta wrote:
> So here's a less-broken version of your suggestion, but it's still broken; a
> relatively complex wrapper is required to do this right:
Thanks. My "something like" should more accurately have been "I really
didn't think about this at all." But I do think a GIT_EXTERNAL_DIFF-type
approach (and if GIT_EXTERNAL_DIFF isn't powerful enough, considering
some alternate interface) is nicer than trying to wrap git-diff.
> $ cat >merge.sh <<EOF
> #!/bin/sh
> [ \$# -eq 7 ] && opendiff "\$2" "\$5"
> EOF
This is probably easier to read using <<'EOF' to quote (but I failed to
do even that in my example).
-Peff
next prev parent reply other threads:[~2007-11-21 13:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-21 10:31 Using Filemerge.app as a git-diff viewer Toby White
2007-11-21 11:20 ` Jonathan del Strother
2007-11-21 11:27 ` Jeff King
2007-11-21 12:59 ` Wincent Colaiuta
2007-11-21 13:04 ` Jeff King [this message]
2007-11-21 13:58 ` Jakub Narebski
2007-11-21 13:10 ` Toby White
2007-11-21 13:28 ` Wincent Colaiuta
2007-11-21 14:36 ` Jeff King
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=20071121130446.GA18414@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=tow21@cam.ac.uk \
--cc=win@wincent.com \
/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).