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?
Here's a script (originally by Toby White) that I hacked up to compare the entire directory structure in FileMerge rather than opening each file individually.
Put this somewhere on your path. I prefer
~/bin/git-opendiff
, which meansgit opendiff ...
works as expected.Update: diff unstaged changes when called with no arguments, added
-h
(help) option.Update: diff subdirectory with
-- <path>
. Also better argument parsing.