tue-robocup-update is now rebase and autostash

tue-robotics · Aug 8, 2023 · 47b02ed · 47b02ed
1 parent 6eb587f
commit 47b02ed
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/setup/tue-functions.bash b/setup/tue-functions.bash
@@ -1751,7 +1751,7 @@ function tue-robocup-install-package
 
 function tue-robocup-update
 {
-    _tue-repos-do "git pull --ff-only"
+    _tue-repos-do "git pull --rebase --autostash"
 
     # Copy rsettings file
     if [ "$ROBOT_REAL" != "true" ]