Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

git-difftool: full file tree compare using meld?

Tags:

Is there an easy way to compare the file tree of an old git commit with the working file tree, in meld?

git-difftool does something very similar, but I don't want it to actually do any diffing; the whole point is that the tool it is calling can provide a better interface for that.

like image 438
Andrew Wagner Avatar asked Mar 17 '10 00:03

Andrew Wagner


2 Answers

With git > 1.7.11, the git difftool command now supports diffing complete directories using the --dir-diff command. This can be used together with meld:

$ git difftool --tool=meld --dir-diff [commit-to-diff-against] 
like image 69
Stefan Seemayer Avatar answered Oct 14 '22 20:10

Stefan Seemayer


I've tested this on a recent version of meld and it is now built in. You can use it with meld <directory path> so "meld ." works for the current directory. You can checkout a version git co [version] then git reset [version]^ and then run "meld ." to compare any version with it's previous version.

like image 26
rado Avatar answered Oct 14 '22 19:10

rado