obsidian plugin, mygvm enhancements

2024-04-05 07:41:23 -04:00
parent 7367c425fb
commit b6689da485
9 changed files with 96 additions and 26 deletions
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,3 +16,15 @@
 	format = ssh
 [commit]
 	gpgsign = true
+[diff]
+    tool = nvimdiff
+[difftool]
+    prompt = false
+[difftool "nvimdiff"]
+    cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
+[merge]
+    tool = nvimdiff
+[mergetool]
+    prompt = true
+[mergetool "nvimdiff"]
+    cmd = "nvim -d \"$LOCAL\" \"$REMOTE\" \"$MERGED\" -c 'wincmd w' -c 'wincmd J'"