diff --git a/git/.gitconfig b/git/.gitconfig
index 280b80e..2c78e15 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -4,6 +4,7 @@
 [core]
   excludesfile = ~/.gitignore_global
   pager = delta
+  sshcommand = ssh.exe
 
 [user]
   name = Fabio Scotto di Santolo
@@ -24,13 +25,6 @@
 
 [merge]
   conflictstyle = diff3
-  tool = meld
-
-[mergetool]
-  prompt = false
-
-[diff]
-  tool = meld
 
 [color]
   ui = always
@@ -81,3 +75,6 @@
   colorMoved = default
   tabs = 4
   side-by-side = true
+
+[credential]
+  helper = manager-core