I didnt even know about the mentioned diff-script: https://github.com/git/git/blob/master/contrib/diff-highligh... It gives pretty nice output :-)

I should definitely learn more about extending git!

There's also this https://github.com/so-fancy/diff-so-fancy

+1 for this. I started using it a few months ago for all my git diffs and I quite like the output. The biggest thing for me is being able to easily see partial line changes.

Requires Node though. Not sure that many people have that installed.

It does not:

> For convenience, the recommended installation is via NPM. If you'd prefer, you may choose to do a manual installation instead. (highlighting by me)

It is written in Perl.

Wait, what? A perl app distributed through NPM? What's next, a node app on CPAN?

Color me perplexed.

There are a lot of non-JS packages in NPM. The Closure compiler, for example.

My favorite git diff extension is the side-by-side diff by cdiff:

https://pypi.python.org/pypi/cdiff

It also features word-level change highlights and other common flares.

I still prefer Araxis.

http://www.araxis.com/merge/index.en

I use: http://www.kaleidoscopeapp.com/

It's the absolute best, been using it for years.

Beyond Compare is the best I've found (especially for complex merges): http://www.scootersoftware.com/

Me too. I tried ataxia for about 6 months and hated it, got told about beyond compare, paid for a license after only a few days of the trial .

Beyond Compare is great. I prefer Araxis. I think most people would be very happy with one of the two. Whichever you happen to prefer.