diff --git a/UpdateAndStart.bat b/UpdateAndStart.bat
index 261f13c33..803a8c951 100644
--- a/UpdateAndStart.bat
+++ b/UpdateAndStart.bat
@@ -4,7 +4,7 @@ git --version > nul 2>&1
 if %errorlevel% neq 0 (
     echo Git is not installed on this system. Skipping update.
 ) else (
-    call git pull
+    call git pull --rebase --autostash
     if %errorlevel% neq 0 (
         REM incase we get merge conflicts or something
         echo There were errors while updating. Please download the latest version manually.