Theaninova/TheaninovOS
1
0
Fork 0
mirror of https://github.com/Theaninova/TheaninovOS.git synced 2025-12-12 11:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

improvements

Browse Source
This commit is contained in:
Thea Schöbl
2023-12-07 20:54:47 +01:00
parent cb007cc158
commit 812c2749c0
7 changed files with 101 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
programs/git.nix
View File

@@ -9,9 +9,15 @@
extraConfig = {
pull.rebase = true;
merge = {
tool = "nvimdiff";
tool = "nvim-mergetool";
conflictstyle = "diff3";
};
mergetool.nvim-mergetool = {
cmd = ''
nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
'';
trustExitCode = true;
};
mergetool.prompt = false;
};
}