Skip to content

Instantly share code, notes, and snippets.

@somewhatabstract

somewhatabstract/.gitconfig

Created October 12, 2022 18:45
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 somewhatabstract/8da1fa1c5013faee1a6549b6ee707002 to your computer and use it in GitHub Desktop.
Save somewhatabstract/8da1fa1c5013faee1a6549b6ee707002 to your computer and use it in GitHub Desktop.
Download ZIP
Git Config snippet: VSCode for editing, merging, and diffing
Raw
.gitconfig
[core]
editor = code --wait
[diff]
tool = vscode
[difftool]
prompt = false
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[merge]
tool = vscode
[mergetool]
prompt = false
[mergetool "vscode"]
cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment