Browse Source

Fix mfrb and mfpub

pull/1/head
Scott Lahteine 8 years ago
committed by Scott Lahteine
parent
commit
bef9791ea3
  1. 2
      buildroot/share/git/mfpub
  2. 2
      buildroot/share/git/mfrb

2
buildroot/share/git/mfpub

@ -48,7 +48,7 @@ git clean -d -f
# Push 'master' to the fork and make a proper PR... # Push 'master' to the fork and make a proper PR...
if [[ $BRANCH == "master" ]]; then if [[ $BRANCH == "master" ]]; then
if [[ $$FORK == "MarlinFirmware" ]]; then if [[ $FORK == "MarlinFirmware" ]]; then
# Allow working directly with the main fork # Allow working directly with the main fork
git push -f upstream git push -f upstream

2
buildroot/share/git/mfrb

@ -14,7 +14,7 @@ case "$#" in
esac esac
# If the branch isn't currently the PR target # 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 fetch upstream
git rebase upstream/${INFO[3]} && git rebase -i upstream/${INFO[3]} git rebase upstream/${INFO[3]} && git rebase -i upstream/${INFO[3]}
fi fi

Loading…
Cancel
Save