Fix mfrb and mfpub
This commit is contained in:
parent
66bedc1a24
commit
bef9791ea3
2 changed files with 2 additions and 2 deletions
|
@ -48,7 +48,7 @@ git clean -d -f
|
|||
# Push 'master' to the fork and make a proper PR...
|
||||
if [[ $BRANCH == "master" ]]; then
|
||||
|
||||
if [[ $$FORK == "MarlinFirmware" ]]; then
|
||||
if [[ $FORK == "MarlinFirmware" ]]; then
|
||||
|
||||
# Allow working directly with the main fork
|
||||
git push -f upstream
|
||||
|
|
|
@ -14,7 +14,7 @@ case "$#" in
|
|||
esac
|
||||
|
||||
# If the branch isn't currently the PR target
|
||||
if [[ ${INFO[4]} != ${INFO[5]} ]]; then
|
||||
if [[ ${INFO[3]} != ${INFO[4]} ]]; then
|
||||
git fetch upstream
|
||||
git rebase upstream/${INFO[3]} && git rebase -i upstream/${INFO[3]}
|
||||
fi
|
||||
|
|
Reference in a new issue