Archives/foodotfiles
2
1
Fork 0
mirror of https://git.korhonen.cc/FunctionalHacker/dotfiles.git synced 2024-11-15 00:14:59 +00:00
Code Issues Packages Projects Releases Wiki 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
No known key found for this signature in database
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] [merge]
prompt = false prompt = false
conflictstyle = diff3
tool = nvim-merge tool = nvim-merge
[mergetool "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 keepBackup = false
[diff] [diff]
@ -50,3 +51,6 @@
[credential] [credential]
helper = cache --timeout=600 helper = cache --timeout=600
helper = !pass-git-helper $@ helper = !pass-git-helper $@
[rerere]
enabled = true