@b0rk I never do this, but for a side-by-side diff,...

@b0rk I never do this, but for a side-by-side diff, try

git difftool --tool=vimdiff --color-words --no-index <path> <path>

(You can usually leave out `--no-index` with git-diff (according to the docs, "You can omit the --no-index option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git"), but with git-difftool, apparently you do still need it)

Like 24 September at 14:27 | Wall-to-wall | Open on recurse.social

2 comments

Julia Evans

@lindsey hm that doesn't work for me but other than the side by side thing `git diff` seems to do the best job of anything anyone has suggested so far

24 September at 14:31 | Open on social.jvns.ca

Lindsey Kuper

@b0rk hmm, here's what I get. you could probably tell git-difftool to use something else that shows files side by side, if vimdiff is the problem for you

a side-by-side diff of two files using vimdiff, highlighting changed wors

24 September at 14:39 | Open on recurse.social