Update Ansible inventory and playbook for new workstation; modify Git configuration for rebase settings

config/git.nix

@@ -35,12 +35,7 @@
       };
 
       pull = {
-        rebase = true;
-      };
-
-      branch = {
-        autosetupmerge = "always";
-        autosetuprebase = "always";
+        rebase = false;
       };
 
       merge = {
@@ -48,6 +43,10 @@
         conflictstyle = "diff3";
       };
 
+      rebase = {
+        autoStash = true;
+      };
+
       diff = {
         tool = "delta";
       };