2017-08-25 10:35:25 -05:00
|
|
|
read -p "Commit message? " cm;
|
|
|
|
|
git fetch --all;
|
2017-08-21 20:30:08 +00:00
|
|
|
|
2017-08-25 10:35:25 -05:00
|
|
|
#copy dev to history to ensure we don't lose changes if something goes wrong
|
|
|
|
|
git checkout history;
|
|
|
|
|
git reset --hard dev;
|
|
|
|
|
git push --force;
|
|
|
|
|
|
|
|
|
|
#merge to master
|
|
|
|
|
git checkout -B master origin/master;
|
|
|
|
|
git merge --squash dev;
|
|
|
|
|
git commit -am "$cm";
|
|
|
|
|
git push;
|
|
|
|
|
|
|
|
|
|
#clean dev
|
|
|
|
|
git checkout dev;
|
|
|
|
|
git reset --hard master;
|
|
|
|
|
git push --force;
|
2017-09-28 11:34:36 -05:00
|
|
|
git reset --hard origin/dev
|
