macos - How do I pipe in FileMerge as a diff tool with git on OS X?

Question

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

I want to be able to send diffs to FileMerge.

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?

question from:https://stackoverflow.com/questions/2466821/how-do-i-pipe-in-filemerge-as-a-diff-tool-with-git-on-os-x

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.