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

Git: enable rerere and diff3 mode

Browse source
This commit is contained in:
Marko Korhonen 2022-11-04 12:49:22 +02:00
parent 8983127f3e
commit 1962505d8e
Signed by: FunctionalHacker
GPG key ID: A7F78BCB859CD890
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
home/.config/git/config
View file

@ -20,10 +20,11 @@
[merge]
prompt = false
conflictstyle = diff3
tool = nvim-merge
[mergetool "nvim-merge"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
keepBackup = false
[diff]
@ -50,3 +51,6 @@
[credential]
helper = cache --timeout=600
helper = !pass-git-helper $@
[rerere]
enabled = true