From daaa9382253a02861b7dfb250b7dae0e492d0973 Mon Sep 17 00:00:00 2001 From: Philip Johnson Date: Fri, 31 Jul 2015 07:46:23 -1000 Subject: [PATCH] Set the remote branch on every pull --- morea-publish.sh | 0 morea-pull.sh | 2 +- morea-vanilla-install.sh | 0 3 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 morea-publish.sh mode change 100644 => 100755 morea-vanilla-install.sh diff --git a/morea-publish.sh b/morea-publish.sh old mode 100644 new mode 100755 diff --git a/morea-pull.sh b/morea-pull.sh index 983cfd4..87a4794 100755 --- a/morea-pull.sh +++ b/morea-pull.sh @@ -11,7 +11,7 @@ if [ ! -d "./gh-pages" ]; then fi echo "Pulling the gh-pages directory." -( set -x ; cd ./gh-pages ; git pull ) +( set -x ; cd ./gh-pages ; git branch -u origin/gh-pages ; git pull ) echo "Pulling the master directory" ( set -x ; cd ./master ; git pull) diff --git a/morea-vanilla-install.sh b/morea-vanilla-install.sh old mode 100644 new mode 100755