From 7a13673828f088c179763e8621a94e334319f226 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Tue, 4 Jul 2017 03:28:52 -0400 Subject: 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 --- files/update-dev.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'files') 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 -- cgit v1.2.3