How do I pipe in FileMerge as a diff tool with git on OSX?

Question

I'm new to git, on OSX, using it via command line. I come from the world of Tortoise SVN and Beyond Compare on Windows.

I want to be able to pipe in diffs to happen via FileMerge which I have installed already.

I was able to do this with TextMate simply by using:

git diff | mate

But I'm not sure how to get that set up so I can use FileMerge instead?

Answer 1

Although it's not exactly the same as piping stdin into a script, you can do this:

git difftool -t opendiff -y

That will launch FileMerge once for each file. Doing the whole project tree at once takes a little scripting.

See also this question.