Setting Visual Studio Code as your git merge and diff tool

Paste the following lines in your ~/.gitconfig file:

# This is Git's per-user configuration file.
[core]
    editor = code --wait
[diff]
    tool = default-difftool
[difftool "default-difftool"]
    cmd = code --wait --diff $LOCAL $REMOTE
[merge]
    tool = default-mergetool
[mergetool "default-mergetool"]
    cmd = code --wait $MERGED

Done! Next time you do a git commit or whatever operation that needs a text editor, Visual Studio Code will be opened as your default editor.