weeheavy/dotfiles
1
1
Fork 0
Code Pull requests Activity

feat(gitconfig): nvdimdiff > vimdiff

Browse source
This commit is contained in:
Oliver Ladner 2026-01-20 13:54:37 +01:00
commit 2cc7a82586
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.config/git/config
View file

@ -13,7 +13,9 @@
helper = cache --timeout=604800 helper = cache --timeout=604800
[diff] [diff]
tool = vimdiff tool = nvimdiff
[difftool "nvimdiff"]
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
[http] [http]
postBuffer = 524288000 postBuffer = 524288000
@ -25,8 +27,16 @@
[init] [init]
defaultBranch = main defaultBranch = main
[merge] [merge]
tool = "nvim"
conflictstyle = diff3 conflictstyle = diff3
[mergetool]
keepBackup = false
prompt = true
[mergetool "nvim"]
cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\""
# Set a correct user.name and user.email for work projects # Set a correct user.name and user.email for work projects
[includeIf "gitdir:~/git/work/"] [includeIf "gitdir:~/git/work/"]
path = ~/git/work/gitconfig path = ~/git/work/gitconfig