3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Tweaks to git helpers

Browse source
This commit is contained in:
Scott Lahteine 2020-09-28 03:57:09 -05:00
parent 4584a52ba5
commit d4a5b10133
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
buildroot/share/git/mfrb
View file

@ -23,8 +23,5 @@ done
[[ $USAGE == 1 ]] && { echo "usage: `basename $0` [1|2|3]" 1>&2 ; exit 1 ; }
# If the branch isn't currently the PR target
if [[ $TARG != $CURR ]]; then
[[ $QUICK ]] || git fetch upstream
git rebase upstream/$TARG && git rebase -i upstream/$TARG
fi
[[ $QUICK ]] || git fetch upstream
git rebase upstream/$TARG && git rebase -i upstream/$TARG