added some more qol git settings.

modules/home-manager/git.nix

@@ -44,36 +44,37 @@
           line-numbers = true;
         };
       };
-      # difftastic.enable=true;
-      # difftastic.background="dark";
       userEmail = config.user.git.profile.email;
       userName = config.user.git.profile.name;
       extraConfig = {
-        init = {
+        init.defaultBranch = "main";
-          defaultBranch = "main";
-        };
         push = {
           autoSetupRemote = true;
-          default = "current";
+          default = "simple";
+          followTags = true;
         };
-        pull = {
+        fetch = {
-          ff = true;
+          prune = true;
+          pruneTags = true;
+          all = true;
         };
-        merge = {
+        pull.ff = true;
-          conflictstyle = "zdiff3";
+        merge.conflictstyle = "zdiff3";
+        diff = {
+          algorithm = "histogram";
+          colorMoved = "plain";
+          mnemonicPrefix = true;
+          renames = true;
         };
-        rebase = {
+        rerere = {
-          autosquash = true;
+          enabled = true;
-        };
+          autoupdate = true;
-        help = {
-          autocorrect = "prompt";
-        };
-        branch = {
-          sort = "-committerdate";
-        };
-        status = {
-          submodulesummary = true;
         };
+        rebase.autosquash = true;
+        help.autocorrect = "prompt";
+        branch.sort = "-committerdate";
+        tag.sort = "version:refname";
+        status.submodulesummary = true;
       };
       includes =
         if config.user.git.workProfile.enable