Take the 2-minute tour ×
Super User is a question and answer site for computer enthusiasts and power users. It's 100% free, no registration required.

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

share|improve this question
    
Thank you for your answers! –  Masi Aug 27 '09 at 0:14
add comment

5 Answers

up vote 10 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

share|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
2  
Yes you can - File→New..., leave file paths empty and press OK, then you can paste. –  Beni Cherniavsky-Paskin Jun 28 '12 at 9:03
add comment

Diffuse works well.

alt text

share|improve this answer
add comment

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

share|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
add comment

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

share|improve this answer
add comment

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

share|improve this answer
add comment

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

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