From dd03bd6090b39188cfdaec7a25c395e8b7748f87 Mon Sep 17 00:00:00 2001
From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com>
Date: Fri, 9 Aug 2024 16:11:54 +0200
Subject: [PATCH] Git: Enable merge by default

---
 home/features/cli/git.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/features/cli/git.nix b/home/features/cli/git.nix
index ec86a20..3f6ce29 100644
--- a/home/features/cli/git.nix
+++ b/home/features/cli/git.nix
@@ -12,6 +12,7 @@
       commit.gpgsign = true;
       user.signingkey = "0x2C2C1C62A5388E82";
       init.defaultBranch = "main";
+      pull.rebase = false; # merge by default
     };
     lfs.enable = true;
     aliases = {