🔧 Git: Add VsCode as difftool and mergetool

ebouchut · Sep 30, 2024 · a72b361 · a72b361
1 parent 1acf81c
commit a72b361
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/tag-git/gitconfig b/tag-git/gitconfig
@@ -113,6 +113,8 @@
 [difftool "sourcetree"]
 	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
 	path = 
+[difftool "vscode"]
+    cmd = code --wait --new-window --diff $LOCAL $REMOTE
 [merge]
 	tool = smerge
 	conflictStyle = zdiff3
@@ -133,6 +135,8 @@
 [mergetool "splice"]
 	cmd = vim -f \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" -c SpliceInit
 	trustExitCode = true
+[mergetool "vscode"]
+    cmd = code --wait --new-window --merge $REMOTE $LOCAL $BASE $MERGED
 [interactive]
 	diffFilter = diff-highlight
 [hub]