Skip to content

Instantly share code, notes, and snippets.

@Wilhelmsson177
Wilhelmsson177 / gist:7aaba7b402591f75d6536b0f49d9a8b2
Last active November 27, 2018 10:17
How ro set vs code as diff and merge tool
# 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
````

Keybase proof

I hereby claim:

  • I am wilhelmsson177 on github.
  • I am wilhelmsson177 (https://keybase.io/wilhelmsson177) on keybase.
  • I have a public key ASAQdCFp4k6VAgMsA-8tYsGvonzHMXzYSWc341UoVevf3Qo

To claim this, I am signing this object: