Created
January 16, 2019 22:54
-
-
Save jackawatts/a62757b56d74ba15eadc3aab0d9230cb to your computer and use it in GitHub Desktop.
Vscode as default merge tool for git
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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