diff options
| author | Allan Wang <me@allanwang.ca> | 2017-07-04 14:11:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-04 14:11:52 -0400 |
| commit | d6c5bcd56e293eaf281663b6c1e6b0ab7236be9f (patch) | |
| tree | dec58af06d220ba80920fcf9c816b71413c61108 /files | |
| parent | 7a13673828f088c179763e8621a94e334319f226 (diff) | |
| download | frost-d6c5bcd56e293eaf281663b6c1e6b0ab7236be9f.tar.gz frost-d6c5bcd56e293eaf281663b6c1e6b0ab7236be9f.tar.bz2 frost-d6c5bcd56e293eaf281663b6c1e6b0ab7236be9f.zip | |
Small miscellaneous fixes
* mist
* Add back experimental section
* Remove update dev sh
Diffstat (limited to 'files')
| -rw-r--r-- | files/update-dev.sh | 10 | ||||
| -rw-r--r-- | files/update-dev.txt | 15 |
2 files changed, 15 insertions, 10 deletions
diff --git a/files/update-dev.sh b/files/update-dev.sh deleted file mode 100644 index 8516f992..00000000 --- a/files/update-dev.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -git checkout dev -git cmp hard rebase -git branch -f dev-bak dev -git checkout master -git pull origin master -git branch -f dev master -git checkout dev -git push -u -f origin dev
\ No newline at end of file diff --git a/files/update-dev.txt b/files/update-dev.txt new file mode 100644 index 00000000..91ff4c1b --- /dev/null +++ b/files/update-dev.txt @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +# Script to reset dev branch to master +# Once it is squashed and merged on github +# Copy this to a sh file, which is gitignored +# So there won't be save conflicts + +git checkout dev +git cmp hard rebase +git branch -f dev-bak dev +git checkout master +git pull -f origin master +git branch -f dev master +git checkout dev +git push -u -f origin dev |