From edc66f9ed57d2305bb22c3102c368fe20cd22ef3 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 19 Nov 2023 14:20:45 -0500
Subject: [PATCH] Update update add back --no-rebase

---
 update | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/update b/update
index 04409734..8e9f3c9b 100755
--- a/update
+++ b/update
@@ -26,7 +26,7 @@ sudo sed -i 's/console=tty1 r/console=tty1 maxcpus=1 r/g' /boot/cmdline.txt # si
 
 cd /home/pi/CubeSatSim
 
-git pull > .updated
+git pull --no-rebase > .updated
 
 make debug
 
@@ -135,7 +135,7 @@ cd /home/pi/pi-power-button
 
 # git checkout reboot-mode-change
 
-git pull > .updated_p
+git pull --no-rebase > .updated_p
 
   grep 'changed' /home/pi/pi-power-button/.updated_p
   if [[ $(grep 'changed' /home/pi/pi-power-button/.updated_p) ]]; then
@@ -186,7 +186,7 @@ git pull > .updated_p
     FLAG=1
 
     cd /home/pi/pi-power-button
-    git pull
+    git pull --no-rebase
     git checkout reboot-mode-change
     script/install