bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix mfrb and mfpub

Browse Source
This commit is contained in:
Scott Lahteine 2017-05-05 14:14:13 -05:00 committed by Scott Lahteine
parent 66bedc1a24
commit bef9791ea3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildroot/share/git/mfpub
View File

@ -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
View File

@ -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