Gabe/nix-config
1
0
Fork 0
Code Issues 12 Pull requests Projects Releases Packages Wiki Activity

added git option to always rebase on pull.

Browse source
This commit is contained in:
Gabe Venberg 2025-04-28 13:02:02 +02:00
parent 031e1b1b34
commit 839e0506cf
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745400750, "lastModified": 1745575554,
"narHash": "sha256-sXLl6fuWPyZll4ok1b1pbxJLJ5ZnK/NUfL8+SK42P5Q=", "narHash": "sha256-ioRMsU7DNwcK2jejNO8pG9ntLU5+kmhueazL+TuEva0=",
"owner": "gabevenberg", "owner": "gabevenberg",
"repo": "copyparty", "repo": "copyparty",
"rev": "a54e950ecca45225d94c5e982e2dd3453c09ea22", "rev": "7c9cc768471994ff224883f43022af193d5bd95a",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
modules/home-manager/git.nix
View file

@ -60,7 +60,10 @@
pruneTags = true; pruneTags = true;
all = true; all = true;
}; };
pull.ff = true; pull = {
ff = true;
rebase = "merges";
};
merge.conflictstyle = "zdiff3"; merge.conflictstyle = "zdiff3";
diff = { diff = {
algorithm = "histogram"; algorithm = "histogram";