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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
