diff --git a/nix/home-manager/modules/packages/git.nix b/nix/home-manager/modules/packages/git.nix
index df316e6..45a8396 100644
--- a/nix/home-manager/modules/packages/git.nix
+++ b/nix/home-manager/modules/packages/git.nix
@@ -6,7 +6,11 @@
 }: {
   programs.git = {
     enable = true;
-    difftastic.enable = true;
+    # Don't use difftastic on git-diff by default
+    # it makes distributing patches difficult
+    #
+    # Instead use difftastic as a difftool
+    difftastic.enable = false;
 
     userName = "Anthony Cicchetti";
     userEmail = "anthony@anthonycicchetti.com";
@@ -15,6 +19,7 @@
       pushall = "!git remote | xargs -L1 git push --all";
       pr = "!f() { git fetch -fu $${2:-$(git remote |grep ^upstream || echo origin)} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f";
       logp = "log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short";
+      difft = "difftool";
     };
 
     extraConfig = {
@@ -27,6 +32,17 @@
         workers = 0;
       };
 
+      diff = {
+        tool = "difftastic";
+      };
+
+      difftool = {
+        prompt = false;
+        difftastic = {
+          cmd = "${pkgs.difftastic}/bin/difft --color auto --background light --display side-by-side \"$LOCAL\" \"$REMOTE\"";
+        };
+      };
+
       fetch = {
         prune = true;
       };
@@ -35,10 +51,22 @@
         pretty = "fuller";
       };
 
+      help = {
+        autoCorrect = "prompt";
+      };
+
+      init = {
+        defaultBranch = "main";
+      };
+
       log = {
         follow = true;
       };
 
+      merge = {
+        conflictStyle = "zdiff3";
+      };
+
       push = {
         autoSetupRemote = true;
       };
@@ -47,15 +75,13 @@
         rebase = true;
       };
 
-      init = {
-        defaultBranch = "main";
-      };
-      help = {
-        autoCorrect = "prompt";
-      };
       rebase = {
         updateRefs = true;
       };
+
+      rerere = {
+        enabled = true;
+      };
     };
 
     includes = [