From f3ad5d8458351ffdecadf770418e716257628058 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Wed, 5 Feb 2025 13:16:58 -0500 Subject: [PATCH] Update update add git pull when switching branch --- update | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/update b/update index ea1c565e..e4d89055 100755 --- a/update +++ b/update @@ -10,6 +10,7 @@ if [ -z "$1" ] ; then else checkout=1 branch="$1" + echo -n "changing to branch " echo $branch FLAG=1 fi @@ -51,7 +52,8 @@ cd /home/pi/CubeSatSim git pull --no-rebase > .updated if [ $checkout -eq 1 ]; then - git checkout $branch + git checkout $branch + git pull --no-rebase fi make debug