mirrors/dotfiles
1
0
Fork 0
mirror of https://github.com/tylernguyen/dotfiles.git synced 2025-02-05 01:03:15 -06:00
Code Issues Releases Activity

refactor: inherit vscode docs snippet

Browse source
This commit is contained in:
Tyler Nguyen 2024-11-14 22:58:39 -06:00
parent f7cfa44fad
commit e430f67d3f
No known key found for this signature in database
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dot_gitconfig.tmpl
View file

@ -6,16 +6,16 @@
{{ end }} {{ end }}
[diff] [diff]
tool = vscode tool = default-difftool
[difftool "vscode"] [difftool "default-difftool"]
cmd = code --wait --diff $LOCAL $REMOTE cmd = code --wait --diff $LOCAL $REMOTE
[merge] [merge]
tool = vscode tool = code
[mergetool "vscode"] [mergetool "code"]
cmd = code --wait $MERGED cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED
[user] [user]
name = Tyler Nguyen name = Tyler Nguyen