Change merge and diff tool for git on workstation

2026-07-29 16:20:01 +00:00 · 2026-05-28 14:54:07 +02:00
parent a2c5d77483
commit 818d972493
1 changed files with 8 additions and 2 deletions
--- a/ansible/templates/workstation/.gitconfig.j2
+++ b/ansible/templates/workstation/.gitconfig.j2
@@ -24,13 +24,19 @@

 [merge]
  conflictstyle = diff3
-  tool = meld
+  tool = vscode

 [mergetool]
  prompt = false

+[mergetool "vscode"]
+  cmd = code --reuse-window --wait $MERGED
+
 [diff]
-  tool = meld
+  tool = vscode
+
+[difftool "vscode"]
+  cmd = code --reuse-window --wait --diff $LOCAL $REMOTE

 [color]
  ui = always