From 6f81c7c6e4ef94daee0c77e2acca3dad6a8b7273 Mon Sep 17 00:00:00 2001
From: "christoph.hollizeck" <christoph.hollizeck@web.de>
Date: Wed, 27 Mar 2024 14:42:41 +0100
Subject: [PATCH] use merge instead of rebase

---
 modules/home/tools/git/default.nix  | 2 +-
 modules/nixos/tools/git/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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