diff options
Diffstat (limited to 'files/update-dev.sh')
| -rw-r--r-- | files/update-dev.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/files/update-dev.sh b/files/update-dev.sh index 3c960ae4..2d5ac2fe 100644 --- a/files/update-dev.sh +++ b/files/update-dev.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash git checkout dev -git branch -d dev-bak -git checkout -b dev-bak +git cmp hard rebase +git branch -f dev-bak dev git checkout master git pull -f origin master -git branch -d dev -git checkout -b dev -git push --set-upstream origin dev
\ No newline at end of file +git branch -f dev master +git checkout dev +git push -u -f origin dev |