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
# 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 | |
```` |