diff options
Diffstat (limited to 'files/update-dev.txt')
| -rw-r--r-- | files/update-dev.txt | 15 |
1 files changed, 15 insertions, 0 deletions
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 |