xxtip: simplify
This commit is contained in:
parent
957bfc9c6f
commit
3f6245124b
@ -8,8 +8,5 @@ back_to_current_branch() {
|
|||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
git checkout master
|
git fetch upstream master
|
||||||
git pull --rebase upstream master
|
git rebase upstream/master
|
||||||
git push -f
|
|
||||||
git checkout "$current_branch"
|
|
||||||
git rebase master
|
|
||||||
|
Loading…
Reference in New Issue
Block a user