What is the best difftool for Git repos like OS X's Opendiff?
If you're after a graphical diff command, you should give Meld a go. It's a visual diff and merge tool. I think it is present by default on Ubuntu systems
Diffuse works well.
I use KDiff3. It is one of the best tools available for comparison or merging two or three text input files or directories.
If your looking for command line diff would work wouldn't it? For graphical and not free I like Beyond Compare
Besides the obvious '
git diff' gnu emacs has a mode for diff (obviously :-), called ediff. And there is a relatively standard graphical interface for git, called
gitk. Below is a screenshot of ediff.
I'm a vim user and I like the vim diff feature.
It's a vertically split screen with one vim at each side.
Git knows how to invoke it after you configure it thus:
git config --global merge.tool gvimdiff
On each side of the diff I have all the power of vim, configured as I like it.
DON'T DO THIS AT HOME IF YOU ARE NOT A VIM USER!
Although very powerful and highly usable, vim is known for catering from quite a different paradigm as compared to the usual GUI editors like Notepad and all the many excellent other editors based in the same paradigm.
Before using this feature you should get acquainted with the vim UI. It easy, it is logical, but it's different. All the caveats about people reacting to change apply here.
Oops I might sound like a vim hooligan! Not so: I like diversity, even at the text editor level. So does Git.