Is there a combination of a GUI diff viewer and a git configuration that would allow me to view all modified files at once? Currently I use git difftool
and it invokes a separate diff viewer for each file.
It would be great if there was a way to force git to put both versions of all modified files somewhere and invoke the diff tool for all of them only once.
4 Answers
Since git 1.7.11, difftool
supports directory comparison:
"
git difftool
" learned the "--dir-diff
" option to spawn external diff tools that can compare two directory hierarchies at a time after populating two temporary directories, instead of running an instance of the external tool once per a file pair.
So you could combine it with an external diff tool, as mentioned in "use Winmerge
inside of Git to file diff
".
Have a look at Atlassian SourceTree
. It's a free Git Client for Windows
& Mac
.
I'm using it since the beta. And it's really the best tool ive ever used for git in my opinion.
Say goodbye to the command line – use the full capability of Git and Mercurial in the SourceTree desktop app. Manage all your repositories, hosted or local, through SourceTree's simple interface.
More informations under:
http://blog.bitbucket.org/2013/03/19/introducing-sourcetree-git-client-microsoft-windows/ http://www.sourcetreeapp.com/
diff
them all? If it is the former, to what end? - Urs Reupke