aboutsummaryrefslogtreecommitdiff
path: root/files/update-dev.sh
diff options
context:
space:
mode:
Diffstat (limited to 'files/update-dev.sh')
-rw-r--r--files/update-dev.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/files/update-dev.sh b/files/update-dev.sh
index 8516f992..2d5ac2fe 100644
--- a/files/update-dev.sh
+++ b/files/update-dev.sh
@@ -4,7 +4,7 @@ git checkout dev
git cmp hard rebase
git branch -f dev-bak dev
git checkout master
-git pull origin master
+git pull -f origin master
git branch -f dev master
git checkout dev
-git push -u -f origin dev \ No newline at end of file
+git push -u -f origin dev