Git: enable rerere and diff3 mode
This commit is contained in:
parent
5430b88cad
commit
1206df05cc
1 changed files with 5 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue