6 ms·
In a few (relatively) short years, git's diff has improved on all the other diffs out there.
by emmelaich 10y ago
In a few (relatively) short years, git's diff has improved on all the other diffs out there.
- darfs 10y agoI didnt even know about the mentioned diff-script: https://github.com/git/git/blob/master/contrib/diff-highlight/diff-highlight https://github.com/git/git/blob/master/contrib/diff-highligh... It gives pretty nice output :-) I should definitely learn more about extending git!
- Spiritus 10y agoThere's also this https://github.com/so-fancy/diff-so-fancy https://github.com/so-fancy/diff-so-fancy
- michaelmior 10y ago+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.
- 0942v8653 10y agoRequires Node though. Not sure that many people have that installed.
- TimWolla 10y agoIt 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.
- ymse 10y agoWait, what? A perl app distributed through NPM? What's next, a node app on CPAN? Color me perplexed.
- dietrichepp 10y agoThere are a lot of non-JS packages in NPM. The Closure compiler, for example.
- maverickwoo 10y agoMy favorite git diff extension is the side-by-side diff by cdiff: https://pypi.python.org/pypi/cdiff https://pypi.python.org/pypi/cdiff It also features word-level change highlights and other common flares.
- forrestthewoods 10y agoI still prefer Araxis. http://www.araxis.com/merge/index.en http://www.araxis.com/merge/index.en
- zwieback 10y agoIt's the absolute best, been using it for years.
- tomtheengineer 10y agoBeyond Compare is the best I've found (especially for complex merges): http://www.scootersoftware.com/ http://www.scootersoftware.com/
- philliphaydon 10y agoMe 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 .
- forrestthewoods 10y agoBeyond Compare is great. I prefer Araxis. I think most people would be very happy with one of the two. Whichever you happen to prefer.
- merb 10y agoI use: http://www.kaleidoscopeapp.com/ http://www.kaleidoscopeapp.com/