From: Jeff King <peff@peff.net>
Date: Wed, 21 Nov 2007 13:04:46 GMT
Subject: Re: Using Filemerge.app as a git-diff viewer
Message-ID: <20071121130446.GA18414@sigill.intra.peff.net>
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