I just recently learned that there’s a --gui option for git difftool, which is nice because I use Kaleidoscope for heavy diffs (and merges too with git mergetool) but recently picked up delta [0] for quicker diffing in the terminal. Now I can have both easily.

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