1 files changed, 20 insertions, 3 deletions
diff --git a/user/settings/git.nix b/user/settings/git.nix
index 3fb6d19c..320f9aeb 100644
--- a/user/settings/git.nix
+++ b/user/settings/git.nix
@@ -34,12 +34,15 @@ in
       core = {
         commitGraph = true;
       };
+      commit = {
+        verbose = true;
+      };
       pull = {
         rebase = true;
       };
       fetch = {
         prune = true;
-        prunetags = true;
+        pruneTags = true;
       };
       push = {
         default = "current";
@@ -47,22 +50,35 @@ in
         followTags = true;
       };
       rebase = {
+        autostash = true;
         autosquash = true;
         updateRefs = true;
       };
       rerere = {
         enabled = true;
+        autoupdate = true;
       };
       merge = {
-        conflictStyle = "diff3";
+        conflictStyle = "zdiff3";
       };
       diff = {
         algorithm = "histogram";
-        colorMoved = "default";
+        colorMoved = "plain";
+        mnemonicPrefix = true;
+        renames = true;
+      };
+      grep = {
+        patternType = "perl";
       };
       remote = {
         autoSetupMerge = true;
       };
+      branch = {
+        sort = "committerdate";
+      };
+      tag = {
+        sort = "version:refname";
+      };
       "branch.master" = {
         rebase = false;
       };
@@ -127,6 +143,7 @@ in
     git-extras # delete-merged-branches and friends
     git-worktree-switcher
     ghq
+    # reduce these on server
     delta
     gitui
     gitstatus