diff --git a/modules/development/git/default.nix b/modules/development/git/default.nix
index bb6357e0..46c8f0a3 100644
--- a/modules/development/git/default.nix
+++ b/modules/development/git/default.nix
@@ -24,8 +24,10 @@
           lfs.enable = true;
           extraConfig = {
             branch.autosetuprebase = "always";
-            pull.rebase = true;
             github.user = "chvp";
+            merge.conflictStyle = "diff3";
+            pull.rebase = true;
+            rerere.enabled = true;
             tag.gpgSign = true;
           };
           ignores = [