Update update add git pull when switching branch

11 months ago · f3ad5d8458
parent 04acaf9bbf
commit f3ad5d8458
1 changed files with 3 additions and 1 deletions
--- a/4
+++ b/4
@ -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