blob: 91ff4c1b68603df5a0eddd831e677573105936e6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
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
|
