Daholli/nixos-config
1
0
Fork 0
Code Issues 3 Pull requests 1 Releases Packages Activity Actions

use merge instead of rebase

Browse source
This commit is contained in:
christoph.hollizeck 2024-03-27 14:42:41 +01:00 • committed by Christoph Hollizeck
parent 77afc25acd
commit ff78383e6d
Signed by: Daholli
GPG key ID: 249300664F2AF2C7
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/home/tools/git/default.nix
View file

@ -23,7 +23,7 @@ in {
lfs = enabled; lfs = enabled;
extraConfig = { extraConfig = {
init = {defaultBranch = "main";}; init = {defaultBranch = "main";};
pull = {rebase = true;}; pull = {rebase = false;};
push = {autoSetupRemote = true;}; push = {autoSetupRemote = true;};
}; };
}; };

2
modules/nixos/tools/git/default.nix
View file

@ -27,7 +27,7 @@ in {
lfs.enable = true; lfs.enable = true;
config = { config = {
init = {defaultBranch = "main";}; init = {defaultBranch = "main";};
pull = {rebase = true;}; pull = {rebase = false;};
push = {autoSetupRemote = true;}; push = {autoSetupRemote = true;};
}; };
}; };