aboutsummaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-07-04 00:32:45 -0700
committerAllan Wang <me@allanwang.ca>2017-07-04 00:32:45 -0700
commit43885c6c063a76738ed7220aba619e47db7c4080 (patch)
tree6269af12c2656f81c54daad59b6b6aee5d4a1066 /files
parentab98d536da8cd5e98132e125b81dde7bfcfa8056 (diff)
parent7a13673828f088c179763e8621a94e334319f226 (diff)
downloadfrost-43885c6c063a76738ed7220aba619e47db7c4080.tar.gz
frost-43885c6c063a76738ed7220aba619e47db7c4080.tar.bz2
frost-43885c6c063a76738ed7220aba619e47db7c4080.zip
fix update
Diffstat (limited to 'files')
-rw-r--r--files/update-dev.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/files/update-dev.sh b/files/update-dev.sh
index 3c960ae4..2d5ac2fe 100644
--- a/files/update-dev.sh
+++ b/files/update-dev.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
git checkout dev
-git branch -d dev-bak
-git checkout -b dev-bak
+git cmp hard rebase
+git branch -f dev-bak dev
git checkout 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
+git branch -f dev master
+git checkout dev
+git push -u -f origin dev