xxxxxxxxxx
git config --global core.editor "code --wait"
VS Code as Git editor
1 - Verify you can run vscode in terminal with code --help
2 - Run git config --global core.editor "code --wait" in terminal
VS Code as Git difftool and mergetool
Run git config --global -e
Add the following configuration
xxxxxxxxxx
[diff]
tool = default-difftool
[difftool "default-difftool"]
cmd = code --wait --diff $LOCAL $REMOTE
[merge]
tool = code
[mergetool "code"]
cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED