Skip to content

Instantly share code, notes, and snippets.

@jackawatts

jackawatts/Vscode as default merge tool for git.bat

Created January 16, 2019 22:54
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jackawatts/a62757b56d74ba15eadc3aab0d9230cb to your computer and use it in GitHub Desktop.
Save jackawatts/a62757b56d74ba15eadc3aab0d9230cb to your computer and use it in GitHub Desktop.
Download ZIP
Vscode as default merge tool for git
Raw
Vscode as default merge tool for git.bat
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"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment