FunctionalHacker/dotfiles
FunctionalHacker/dotfiles
2
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

Add meld as git (merge|diff)tool

Browse source
This commit is contained in:
Marko Korhonen 2023-05-23 22:04:32 +03:00
parent d5973ea4e3
commit 747a44d61e
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
home/.config/git/config
View file

@ -21,19 +21,30 @@
[merge] [merge]
prompt = false prompt = false
conflictstyle = diff3 conflictstyle = diff3
tool = nvim-merge tool = meld
[mergetool "nvim-merge"] [mergetool]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
keepBackup = false keepBackup = false
prompt = false
[mergetool "nvim"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[mergetool "meld"]
cmd = meld --diff $LOCAL $MERGED $REMOTE --diff $BASE $LOCAL --diff $BASE $REMOTE
[diff] [diff]
prompt = false tool = meld
tool = nvim-diff
[difftool "nvim-diff"] [difftool]
prompt = false
[difftool "nvim"]
cmd = nvim -d $LOCAL $REMOTE cmd = nvim -d $LOCAL $REMOTE
[difftool "meld"]
cmd = meld --diff $LOCAL $REMOTE
[pull] [pull]
rebase = merges rebase = merges