up vote 0 down vote favorite
1
share [g+] share [fb]

What is the best difftool for Git repos like OS X's Opendiff?

link|improve this question
100% accept rate
Thank you for your answers! – Masi Aug 27 '09 at 0:14
feedback

5 Answers

up vote 7 down vote accepted

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

link|improve this answer
One downside of Meld - seems like it can only diff existing files, you can't simply copy/paste content into two editor windows to diff them spontaneously – matt b Mar 29 '11 at 17:59
feedback
up vote 5 down vote

Diffuse works well.

alt text

link|improve this answer
feedback
up vote 1 down vote

I use kdiff3. It is one of the best tools available for comparison or merging two or three text input files or directories.

link|improve this answer
feedback
up vote 0 down vote

If your looking for command line diff would work wouldn't it? For graphical and not free I like Beyond Compare

link|improve this answer
Just tried Meld. It wasn't installed by default but it is available from the repo. sudo apt-get install meld – Gren Aug 13 '09 at 18:39
feedback
up vote 0 down vote

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.

link to the screenshot of ediff mode

link|improve this answer
feedback

Your Answer

 
or
required, but never shown
discard

Not the answer you're looking for? Browse other questions tagged or ask your own question.