caio.co/de/dotfiles

git: use nvim for difftool and mergetool

Id
a90865f2d69e10930ef58ad9d7b5a69d002a0456
Author
Caio
Commit time
2023-02-16T18:04:11+01:00

Modified gitconfig

@@ -42,6 +42,10
algorithm = patience
relative = true

+[difftool "nvim"]
+ cmd = nvim -d \"$LOCAL\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd L\"
+
+
[log]
decorate = short

@@ -53,8 +57,13
autosetupmerge = always
[commit]
verbose = true
+
[mergetool]
keepBackup = false
+
+[mergetool "nvimdiff"]
+ cmd = nvim -d \"$LOCAL\" \"$MERGED\" \"$BASE\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd J\"
+
[init]
defaultBranch = main
[pull]