From 9a537c8a14263913a085df75e8dc4aad3ebe49fd Mon Sep 17 00:00:00 2001
From: Sanskar Tiwari <sanskar.mk2@gmail.com>
Date: Sat, 20 May 2023 21:07:28 +0530
Subject: [PATCH] add flags, lf, eof newline

---
 UpdateAndStart.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.