esensar
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add nvimdiff setup for git

main
Ensar Sarajčić 2025-01-24 10:45:50 +01:00
parent 14bf4411ce
commit baceab2173
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
symlinks/gitconfig
View File

@ -11,11 +11,15 @@
[diff] [diff]
tool = nvimdiff tool = nvimdiff
[difftool] [difftool]
prompt = true prompt = false
[difftool "nvimdiff"]
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
[merge] [merge]
tool = nvimdiff tool = nvimdiff
[mergetool] [mergetool]
keepBackup = false keepBackup = false
[mergetool "nvimdiff"]
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\" \"$MERGED\""
[guitool "Add to .gitignore"] [guitool "Add to .gitignore"]
cmd = echo \"\n$FILENAME\" >> .gitignore & git add .gitignore cmd = echo \"\n$FILENAME\" >> .gitignore & git add .gitignore
needsfile = yes needsfile = yes