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 +1 -1
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit bce2d6d6b1 - Show all commits

2
home/.config/git/config
View file

@ -31,7 +31,7 @@
tool = nvim-diff tool = nvim-diff
[difftool "nvim-diff"] [difftool "nvim-diff"]
cmd = nvim -d -R cmd = nvim -d $LOCAL $REMOTE
[pull] [pull]
rebase = merges rebase = merges