Using git difftool to view differences in entire directory

Question

I'm having trouble trying to use git difftool (in this case, opendiff for mac) to visualise the differences made in the latest git commit. I don't want to launch opendiff for each pair of files that has changed, I just want to launch one instance of opendiff which compares the entire directory, so I've followed the advice from this answer which is to use --dir-diff. I ended up using this command:

git difftool HEAD^ HEAD --dir-diff

The problem is that when I launch this command, the opendiff says that there are 0 differences (even though using normal diff will show differences in multiple files). What's going on? How do I use difftool correctly?

That answer specifies that the diff tool must be able to "compare two directory hierarchies at a time after populating two temporary directories". Can opendiff do that? — Chris
– Chris, Commented Jun 29, 2014 at 14:37
The command you provided works well for me with meld on Linux. Maybe opendiff issue? — buff
– buff, Commented Jun 29, 2014 at 15:00

Steven Kramer · Accepted Answer · 2015-12-16 22:10:59Z

1

The files get deleted immediately because opendiff (the command line tool) exits straight after launching FileMerge (the GUI tool). You need to write a short wrapper script that will copy the left and right folders to (another) temp location and start opendiff with those locations.

Edit: you can configure a custom difftool that will start FileMerge directly and wait for it to exit. Add this to your ~/.gitconfig

[difftool "fm"]
cmd = /Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge -left \"$LOCAL\" -right \"$REMOTE\"
path =

edited Dec 16, 2015 at 22:10

answered Aug 27, 2014 at 11:27

Steven Kramer

8,5032 gold badges40 silver badges43 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

Using git difftool to view differences in entire directory

1 Answer 1

Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related