On 21 Nov 2007, at 10:31, Toby White wrote:
Mac OS X bundles a rather nice graphical diff viewer (Filemerge.app)
with its developer tools.
While git-merge knows how to use this as a merge tool, I couldn't
find any way to easily use Filemerge as a viewer for the output
of git-diff.
(http://thread.gmane.org/gmane.comp.version-control.git/58702
discusses the problem, and recommends piping git-diff into kompare.
Filemerge unfortunately won't accept diff output on stdin)
So I wrote a quick script (below) which does what I need. Of all
the available git-diff flags, it only understands "--cached", and
up to two commit objects, and no paths, but that's enough for me.
Within those constraints, it has the same semantics as git-diff.
...
Handy, thanks.
Just as a note to anyone who runs into the same problems as me - I
couldn't persuade this script to work at first. On my Leopard
install, mktemp needs a template argument to run. After replacing
both `mktemp -d`s in this script with `mktemp -d /tmp/diff.XXXXX`, it
works nicely.
Jon
-
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
