Add nvimdiff setup for git

2025-01-24 10:45:50 +01:00 · 2025-01-24 10:45:50 +01:00 · baceab2173
parent 14bf4411ce
commit baceab2173
1 changed files with 5 additions and 1 deletions
--- a/symlinks/gitconfig
+++ b/symlinks/gitconfig
@ -11,11 +11,15 @@
 [diff]
 	tool = nvimdiff
 [difftool]
-	prompt = true
+	prompt = false
+[difftool "nvimdiff"]
+	cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
 [merge]
 	tool = nvimdiff
 [mergetool]
 	keepBackup = false
+[mergetool "nvimdiff"]
+	cmd = "nvim -d \"$LOCAL\" \"$REMOTE\" \"$MERGED\""
 [guitool "Add to .gitignore"]
 	cmd = echo \"\n$FILENAME\" >> .gitignore & git add .gitignore
 	needsfile = yes