diff --git a/git-update b/git-update
index d86810e761..32a085a2fc 100755
--- a/git-update
+++ b/git-update
@@ -42,12 +42,13 @@ def update_subprojects(manifest, no_interaction=False):
 
 def update_repo(repo_name, repo_dir, revision, no_interaction, recurse_i=0):
     print("Updating %s..." % repo_name)
+    git("config", "rebase.autoStash", "true", repository_path=repo_dir)
     try:
         if revision:
             git("fetch", repository_path=repo_dir)
             git("checkout", revision, repository_path=repo_dir)
         else:
-            git("pull", "--rebase", "--autostash", repository_path=repo_dir)
+            git("pull", "--rebase", repository_path=repo_dir)
     except Exception as e:
         out = getattr(e, "output", b"").decode()
         if not no_interaction: