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

Use nvim as diff and merge tool

main
Michael Mandl 2020-05-24 12:57:45 +02:00
parent c38ec860ff
commit 29f6d2e835
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git/gitconfig
View File

@ -20,8 +20,13 @@
whitespace = red reverse whitespace = red reverse
[mergetool] [mergetool]
keepBackup = false keepBackup = false
prompt = false
[diff] [diff]
tool = vimdiff tool = vimdiff
[difftool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[difftool]
prompt = false
[gitflow] [gitflow]
multi-hotfix = true multi-hotfix = true
[gitflow "branch"] [gitflow "branch"]
@ -39,6 +44,8 @@
[format] [format]
pretty = format:%C(yellow)%h %Cblue%>(12)%ad %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s pretty = format:%C(yellow)%h %Cblue%>(12)%ad %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s
[mergetool "nvim"]
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
[rerere] [rerere]
enabled = true enabled = true
[fetch] [fetch]