1 files changed, 9 insertions, 2 deletions
diff --git a/user/settings/git.nix b/user/settings/git.nix
index 769b3728..08903e23 100644
--- a/user/settings/git.nix
+++ b/user/settings/git.nix
@@ -32,21 +32,27 @@
       pull = {
         rebase = true;
       };
+      fetch = {
+        prune = true;
+        prunetags = true;
+      };
       push = {
         default = "current";
+        autoSetupRemote = true;
         followTags = true;
       };
       rebase = {
         autosquash = true;
+        updateRefs = true;
       };
       rerere = {
-        enable = true;
+        enabled = true;
       };
       merge = {
         conflictStyle = "diff3";
       };
       diff = {
-        algorithm = "patience";
+        algorithm = "histogram";
         colorMoved = "default";
       };
       remote = {
@@ -58,6 +64,7 @@
       "branch.main" = {
         rebase = false;
       };
+      "url.git@github.com:".insteadOf = "https://github.com/";
     };
     signing = {
       key = "0xCD4BEB92A8D46583";