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

WIP: Switch to NixOS #5

Draft
FunctionalHacker wants to merge 1349 commits from nix into main
pull from: nix
merge into: FunctionalHacker:main
Conversation 0 Commits 1349 Files changed 333 +5 -1
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1962505d8e - Show all commits

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