Skip to content

Instantly share code, notes, and snippets.

@Wilhelmsson177

Wilhelmsson177/gist:7aaba7b402591f75d6536b0f49d9a8b2

Last active November 27, 2018 10:17
Show Gist options
  • Save Wilhelmsson177/7aaba7b402591f75d6536b0f49d9a8b2 to your computer and use it in GitHub Desktop.
Save Wilhelmsson177/7aaba7b402591f75d6536b0f49d9a8b2 to your computer and use it in GitHub Desktop.
Download ZIP
How ro set vs code as diff and merge tool
Raw
gistfile1.txt
# Use vscode as diff and merge tool
```
git config --global merge.tool vscode
git config --global mergetool.vscode.cmd "code --wait $MERGED"
git config --global diff.tool vscode
git config --global difftool.vscode.cmd "code --wait --diff $LOCAL $REMOTE"
git config --global core.editor "code --wait"
git config --global -e
````
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment