diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix index b4b72b2..2f51442 100644 --- a/modules/home/tools/git/default.nix +++ b/modules/home/tools/git/default.nix @@ -23,7 +23,7 @@ in { lfs = enabled; extraConfig = { init = {defaultBranch = "main";}; - pull = {rebase = true;}; + pull = {rebase = false;}; push = {autoSetupRemote = true;}; }; }; diff --git a/modules/nixos/tools/git/default.nix b/modules/nixos/tools/git/default.nix index 4a837ed..c87496a 100644 --- a/modules/nixos/tools/git/default.nix +++ b/modules/nixos/tools/git/default.nix @@ -27,7 +27,7 @@ in { lfs.enable = true; config = { init = {defaultBranch = "main";}; - pull = {rebase = true;}; + pull = {rebase = false;}; push = {autoSetupRemote = true;}; }; };