3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases 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 bf7ecc761f
commit c0f1052efb
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
buildroot/share/git/mfrb
View file

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