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

9
home/.config/git/config
View file

@ -30,21 +30,12 @@
[mergetool "nvim"] [mergetool "nvim"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[mergetool "meld"]
cmd = meld --diff $LOCAL $MERGED $REMOTE --diff $BASE $LOCAL --diff $BASE $REMOTE
[diff]
tool = meld
[difftool] [difftool]
prompt = false prompt = false
[difftool "nvim"] [difftool "nvim"]
cmd = nvim -d $LOCAL $REMOTE cmd = nvim -d $LOCAL $REMOTE
[difftool "meld"]
cmd = meld --diff $LOCAL $REMOTE
[pull] [pull]
rebase = merges rebase = merges