View ALL Git diffs at once inside VS Code (or other difftools)

Question

I have configured my Git difftool to be VS Code:

[diff]
    tool = default-difftool
[difftool "default-difftool"]
    cmd = code --wait --new-window --diff $LOCAL $REMOTE
    prompt = false

This works fine, but when there are multiple files to diff, they get opened one by one (VS Code launches with a single file diff, I close VS Code, the next file diff opens, etc).

Is there a way to configure Git so that all diffs are opened at once in the same VS Code instance?

Answer 1

1. Install the folder comparison extension for vscode: https://marketplace.visualstudio.com/items?itemName=moshfeu.compare-folders

2. Configure Vscode as the git difftool. Add this to ~/.gitconfig

[diff]
    tool = default-difftool
[difftool "default-difftool"]
    cmd = code --wait --new-window --diff $LOCAL $REMOTE

3. Invoke the git difftool command with -dir-diff option and COMPARE_FOLDERS set to diff

COMPARE_FOLDERS=DIFF git difftool --dir-diff commit1_SHA commit2_SHA