Skip to content

Instantly share code, notes, and snippets.

@renatoassis01
Created July 2, 2019 20:39
Show Gist options
  • Save renatoassis01/53c4e552f3aacaac53abbf6712b5da4b to your computer and use it in GitHub Desktop.
Save renatoassis01/53c4e552f3aacaac53abbf6712b5da4b to your computer and use it in GitHub Desktop.
Vscode Diff and merge tools
# Add this to you gitconfig
# Comment: Start of "Extra Block"
# Comment: This is to unlock VSCode as your git diff and git merge tool
[merge]
tool = vscode
[mergetool "vscode"]
cmd = code --wait $MERGED
[diff]
tool = vscode
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment