diff --git a/flake.lock b/flake.lock
index 20bde1c..6dbb484 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745400750,
-        "narHash": "sha256-sXLl6fuWPyZll4ok1b1pbxJLJ5ZnK/NUfL8+SK42P5Q=",
+        "lastModified": 1745575554,
+        "narHash": "sha256-ioRMsU7DNwcK2jejNO8pG9ntLU5+kmhueazL+TuEva0=",
         "owner": "gabevenberg",
         "repo": "copyparty",
-        "rev": "a54e950ecca45225d94c5e982e2dd3453c09ea22",
+        "rev": "7c9cc768471994ff224883f43022af193d5bd95a",
         "type": "github"
       },
       "original": {
diff --git a/modules/home-manager/git.nix b/modules/home-manager/git.nix
index 851be3f..4ff00ca 100644
--- a/modules/home-manager/git.nix
+++ b/modules/home-manager/git.nix
@@ -60,7 +60,10 @@
           pruneTags = true;
           all = true;
         };
-        pull.ff = true;
+        pull = {
+          ff = true;
+          rebase = "merges";
+        };
         merge.conflictstyle = "zdiff3";
         diff = {
           algorithm = "histogram";