Show both staged & working tree in git diff?

Question

If I run git diff I see the changes in my working tree, and if I run git diff --staged (alternatively --cached) then I see the changes

Answer 1

The diffuse visual diff tool can do that: It will show three panes if some but not all changes are staged. In the case of conflicts, there will even be four panes.

Invoke it with

diffuse -m

in your Git working copy.

If you ask me, the best visual differ I've seen for a decade.