[rdco]

For your third point, maybe try out Kaleidoscope (macOS/iOS only):

https://www.kaleidoscopeapp.com/

You can map git difftool to it to launch it from the command line.

[robin_reala]

Hey thanks, that actually looks really good! Will try it now.