Hacker News Reader

Comment by xixixao | Hacker News Reader

This is great, is there a way to use it with Git?

Edit: It also pains me that this is not the default (or one of the two default) diff views almost anywhere. The best diff I've used was in Phabricator. But Google, Github and Git don't have a support for side-by-side diffs, which I'd argue are the best view in 90% of incremental changes.

View on HN

Yes. In the repo there is a file 'git-icdiff' which runs the following command:

    git difftool --no-prompt --extcmd icdiff "$@"

So you can use 'git icdiff' to get the icdiff display.

In general, you can use git-difftool in conjunction with your diff displayer of choice.

Github implemented split diff 3 months ago: https://github.com/blog/1884-introducing-split-diffs

GitHub added added "split diffs" in September: https://github.com/blog/1884-introducing-split-diffs

Hmm, seems I was overly optimistic. This fails with two words only on one line, highlights the words "red" and "blue" as being composed of each other and so on. Back to

git difftool --color-words

Sorry, could you give an example input icdiff performs poorly on? I just tried it on "red" and "blue", and got http://www.jefftk.com/icdiff-red-blue-2x.png which seems pretty reasonable to me.

Reply on news.ycombinator.com