diff --git a/git/default.nix b/git/default.nix
index 43027cf..84a4f13 100644
--- a/git/default.nix
+++ b/git/default.nix
@@ -78,7 +78,11 @@
 
         push.recurseSubmodules = "on-demand";
 
-        rebase.autostash = true;
+        rebase = {
+          qutoSquash = true;
+          autoStash = true;
+          updateRefs = true;
+        };
 
         rerere = {
           autoupdate = true;