Updated gitconfig

dparo · Sep 3, 2024 · 767d56d · 767d56d
1 parent 6c9b78e
commit 767d56d
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/roles/git/files/config b/roles/git/files/config
@@ -58,6 +58,12 @@
 	prompt = false
 [difftool "vscode"]
     cmd = code --wait --diff $LOCAL $REMOTE
+    keepBackup = false
+	keepTemporaries = false
+	trustExitCode = false
+    prompt = false
+[difftool "idea"]
+    cmd = idea diff $LOCAL $REMOTE
     keepBackup = false
 	keepTemporaries = false
 	trustExitCode = false
@@ -95,6 +101,13 @@
 	prompt = false
 [mergetool "vscode"]
     cmd = code --wait --merge "$REMOTE" "$LOCAL" "$BASE" "$MERGED"
+    keepBackup = false
+	keepTemporaries = false
+    writeToTemp = true
+	trustExitCode = true
+    prompt = false
+[mergetool "idea"]
+    cmd = idea merge "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
     keepBackup = false
 	keepTemporaries = false
     writeToTemp = true