From a367be6426e437705d982b65af6d1537c5a36404 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Wed, 6 Nov 2024 02:01:28 -0600
Subject: [PATCH] Enable git rebase.autostash

---
 oscar/configuration.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index db1e3ae..10eea01 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -202,6 +202,7 @@
         url."ssh://git@github.com/ChandlerSwift/".insteadOf = "gh:";
         push.autoSetupRemote = true;
         rebase.autosquash = true;
+        rebase.autostash = true;
         fetch.parallel = 0; # "some reasonable default"
       };
       ignores = [