aboutsummaryrefslogtreecommitdiff
path: root/files/update-dev.sh
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-07-04 03:28:52 -0400
committerGitHub <noreply@github.com>2017-07-04 03:28:52 -0400
commit7a13673828f088c179763e8621a94e334319f226 (patch)
tree4fb055ac8e180d7ce0eb4a9e3c88dc6230ff8187 /files/update-dev.sh
parentcaf3c4187706ba436fad5e3fa4fd1476a9a4e3ee (diff)
downloadfrost-7a13673828f088c179763e8621a94e334319f226.tar.gz
frost-7a13673828f088c179763e8621a94e334319f226.tar.bz2
frost-7a13673828f088c179763e8621a94e334319f226.zip
Misc fixes
* Remove experimental by default * Update theme * Update glide caching to reload with every version * Pause hidden searchview when not in use * Convert glide to glide app
Diffstat (limited to 'files/update-dev.sh')
-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 d872fdf8..8516f992 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 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 \ No newline at end of file