mirror of
https://github.com/AllanWang/Frost-for-Facebook.git
synced 2024-11-09 12:32:30 +01:00
16 lines
362 B
Plaintext
16 lines
362 B
Plaintext
|
#!/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
|