Autostash on git pull

2023-04-08 20:01:43 +02:00 · 2023-04-08 20:01:43 +02:00 · d545ebde29
parent e3f01844f6
commit d545ebde29
1 changed files with 10 additions and 2 deletions
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@ -113,13 +113,21 @@
      autocorrect = 1;
    };

+    init = {
+      defaultBranch = "main";
+    };
+
    push = {
      default = "current";
      gpgSign = "if-asked";
    };

-    init = {
-      defaultBranch = "main";
+    pull = {
+      rebase = true;
+    };
+
+    rebase = {
+      autoStash = true;
    };

    merge = {