Cleanup

home/.gitconfig

@@ -7,11 +7,13 @@
 
 [branch]
 	autoSetupMerge = true
+
 [init]
 	defaultBranch = "main"
 
 [pull]
 	rebase = true
+
 [push]
 	autoSetupRemote = true
 	default = "current"
@@ -20,24 +22,6 @@
 	email = "jonashahn1@gmx.net"
 	name = "Jonas Hahn"
 
-[diff]
-	tool = nvimdiff
-[difftool "nvimdiff"]
-	#cmd = nvim -d \"$LOCAL\" \"$REMOTE\"
-	cmd = ~/projects/scripts/diffv_wrap.sh \"$LOCAL\" \"$REMOTE\"
-    trustExitCode = true
-
-[merge]
-	tool = nvimdiff
-[mergetool "nvimdiff"]
-	#cmd = nvim -d \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
-	# just pass all that is available to the script
-	cmd = ~/projects/scripts/diffv_wrap.sh \"$LOCAL\" \"$REMOTE\" \"$MERGED\" \"$BASE\" 
-
-    trustExitCode = true
-[mergetool]
-	prompt = false
-
 [core]
 	autocrlf = input