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:07:36 +02:00
parent 031e1b1b34
commit 9054a520b0
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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";