aboutsummaryrefslogtreecommitdiff
path: root/files/update-dev.sh
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-07-04 00:32:01 -0700
committerAllan Wang <me@allanwang.ca>2017-07-04 00:32:01 -0700
commitab98d536da8cd5e98132e125b81dde7bfcfa8056 (patch)
treeb2002d6cdf93f857741a142147b8d672c68ccf82 /files/update-dev.sh
parentcaf3c4187706ba436fad5e3fa4fd1476a9a4e3ee (diff)
downloadfrost-ab98d536da8cd5e98132e125b81dde7bfcfa8056.tar.gz
frost-ab98d536da8cd5e98132e125b81dde7bfcfa8056.tar.bz2
frost-ab98d536da8cd5e98132e125b81dde7bfcfa8056.zip
mist
Diffstat (limited to 'files/update-dev.sh')
-rw-r--r--files/update-dev.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/files/update-dev.sh b/files/update-dev.sh
index d872fdf8..3c960ae4 100644
--- a/files/update-dev.sh
+++ b/files/update-dev.sh
@@ -4,7 +4,7 @@ git checkout dev
git branch -d dev-bak
git checkout -b dev-bak
git checkout master
-git pull origin master
+git pull -f origin master
git branch -d dev
git checkout -b dev
git push --set-upstream origin dev \ No newline at end of file