diff --git a/home/misterio/features/cli/git.nix b/home/misterio/features/cli/git.nix
index ab64fbf4..2dbc9873 100644
--- a/home/misterio/features/cli/git.nix
+++ b/home/misterio/features/cli/git.nix
@@ -48,6 +48,15 @@ in
       user.signing.key = "CE707A2C17FAAC97907FF8EF2E54EA7BFE630916";
       commit.gpgSign = true;
       gpg.program = "${config.programs.gpg.package}/bin/gpg2";
+
+      merge.conflictStyle = "zdiff3";
+      commit.verbose = true;
+      diff.algorithm = "histogram";
+      log.date = "iso";
+      # Automatically track remote branch
+      push.autoSetupRemote = true;
+      # Reuse merge conflict fixes when rebasing
+      rerere.enabled = true;
     };
     lfs.enable = true;
     ignores = [ ".direnv" "result" ];