diff --git a/modules/home/git/default.nix b/modules/home/git/default.nix
index 7bbc040..918ec79 100644
--- a/modules/home/git/default.nix
+++ b/modules/home/git/default.nix
@@ -69,6 +69,7 @@
             if config.chimera.git.gpg.push then "if-asked" else false
           );
         };
+	pull.rebase = "merges";
         url = {
           "ssh://git@github.com/".pushInsteadOf = "https://github.com/";
           "ssh://${config.chimera.git.auth.clicksUsername}@ssh.clicks.codes:29418/".pushInsteadOf = "https://git.clicks.codes/";