riff VS delta

There is rust diff app called riff https://github.com/walles/riff

Ohh I've not heard of riff, I'll need to check that out. Thanks for the heads up! https://github.com/walles/riff

I don't know about those features specifically, but lately I've been enjoying riff, and some other options I can think of are

#!/bin/zsh diffj () { # [] # uses: riff: https://github.com/walles/riff emulate -L zsh local lines if [[ ! $1 ]] { # without txt arg, read from stdin lines=(${(f)"$(>&1)"}) } else { lines=(${(f)"$(<$1)"}) } local colored_lines=() lineno=2 while (( lineno<=${#lines} )) { colored_lines+=( ${(f)"$(riff --no-pager =(<<<${lines[$(( lineno-1 ))]}) =(<<<${lines[$lineno]}))"} ) (( lineno+=1 )) } print -rl -- $lines[1] ${(M)colored_lines:#$'\C-[[32m'*} } diffj $@

Thanks for the difftastic & zoxide tips.

However, I've been using this git pager/difftool: https://github.com/dandavison/delta

While it's not structural like difft, it does produce more readable output for me (at least when scrolling fast through git log -p /scanning quickly

View on GitHub

I'm currently waiting on the integration between Delta and Difftastic:

https://github.com/dandavison/delta/issues/535

Difftastic now has JSON output, whic should make it much easier to build this.

I'm surely in the minority here. I've been using Emacs for almost a decade now, but I just can't get into the Magit workflow. I've tried several times, but always end up going back to Git on the command line. I have dozens of aliases, shell integrations, a nice diff viewer[1], etc., and interacting with Git has become muscle memory. I can commit, cherry-pick, rebase, bisect, fix conflicts, etc., in a fraction of the time it would take me to navigate Magit's UI. I'm sure with enough practice, a Magit user could do this more quickly and efficiently, but honestly, with some custom-built porcelain, Git's UI is not so bad. Though this could very well be Stockholm syndrome after using it for such a long time...

For whatever reason, Magit's opinionated workflows never clicked with me. A part of it is the concern that it will do something weird to my repo that I'll then have to waste more time undoing manually. I usually don't trust sugary wrappers around tools. And another is the fact I don't use Emacs on all machines, and setting up Git on a remote system is just a matter of copying over my config and some shell integrations.

Also, on a more personal note, I find the cultish fanboyism whenever Magit is brought up slightly offputting. Does anyone have anything bad to say about it? No software can realistically be this infallible. :)

[1]: https://github.com/dandavison/delta

For looking at diffs I still prefer the command line though, and use delta to view diffs between commits or branches.