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 = {