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

update git mergetool cmd

Browse Source
This commit is contained in:
Dan Tsivinsky
2022-03-09 11:11:09 +03:00
parent 003b7c79b2
commit 3cc66ee0db
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/.gitconfig
View File

@@ -7,11 +7,12 @@
defaultBranch = master defaultBranch = master
[push] [push]
followTags = true followTags = true
[mergetool "nvim"]
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
[merge] [merge]
tool = nvim tool = nvim
[mergetool] [mergetool]
prompt = false prompt = false
keepBackup = false
[mergetool "nvim"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[pull] [pull]
rebase = false rebase = false