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

Merge tag '2.0.6.1' of https://github.com/MarlinFirmware/Marlin into master

Browse Source
This commit is contained in:
Adam Bissen
2020-10-06 19:33:37 -05:00
parent 17e830b04b ca194ca52e
commit 4f755578b1
1774 changed files with 89990 additions and 22172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
buildroot/share/git/mfpub
View File

@ -67,11 +67,11 @@ if [[ $BRANCH == $TARG ]]; then
# Allow working directly with the main fork
echo
echo -n "Pushing to origin/$TARG... "
git push -f origin
git push origin HEAD:$TARG
echo
echo -n "Pushing to upstream/$TARG... "
git push -f upstream
git push upstream HEAD:$TARG
else
@ -126,7 +126,7 @@ git push -f origin
git push -f upstream | {
while IFS= read -r line
do
[[ $line =~ "gh-pages -> gh-pages" ]] && opensite "http://marlinfw.org/"
[[ $line =~ "gh-pages -> gh-pages" ]] && opensite "https://marlinfw.org/"
echo "$line"
done
}
@ -135,4 +135,4 @@ git push -f upstream | {
rm -rf ${TMPFOLDER}
# Go back to the branch we started from
[[ $BRANCH != $CURR ]] && git checkout $BRANCH && [[ $HAS_STASH == 1 ]] && git stash pop
git checkout $CURR && [[ $HAS_STASH == 1 ]] && git stash pop