amphibient amphibient - 1 month ago 15
Git Question

Is it possible to view git diffs using a GUI side-by-side tool on Mac?

I really hate visualizing diffs using the default UNIX

diff
tool. Is it possible to do view git diffs using a GUI tool that will nicely display the local and remote side-by-side, similar how it is possible to set the
mergetool
to be
DiffMerge
and when you do

git mergetool myfile.txt


it pops the DiffMerge GUI for easier visualization and merging? I am using OSX.

Answer

You could use opendiff. It is a command line tool which opens the GUI of FileMerge.

You could instruct Git to use it automatically for git-mergetool with:

git config --global merge.tool opendiff

If you want it for git-difftool as well:

git config --global diff.tool opendiff

And you could also disable the prompting for every file with:

git config --global difftool.prompt false

For more details type: git help config and search with / for the different options.


P.S. If you don't have opendiff installed you could install it together with the Developer Tools from XCode: https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/opendiff.1.html

UPDATE: In recent versions of XCode, FileMerge is now bundled with XCode. You cannot install FileMerge as a standalone program. opendiff is still in its command-line utilities which are standalone.