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

6 Answers 6

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

Diffuse works well.

alt text

share|improve this answer

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

KDiff3

share|improve this answer

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

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

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.

share|improve this answer
    
I can use Vim too. However, I like the visual appearance and better usability of some GUI editors. They are so much faster to use. –  Masi Dec 21 at 23:46

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.