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 = [