Marlin 2.0 for Flying Bear 4S/5
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
|
|
|
|
#!/usr/bin/env bash
|
|
|
|
|
#
|
|
|
|
|
# mfrb
|
|
|
|
|
#
|
|
|
|
|
# Do "git rebase -i" against the "target" branch (RCBugFix or dev)
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
[[ $# == 0 ]] || { echo "Usage: `basename $0`" 1>&2 ; exit 1; }
|
|
|
|
|
|
|
|
|
|
MFINFO=$(mfinfo) || exit 1
|
|
|
|
|
IFS=' ' read -a INFO <<< "$MFINFO"
|
|
|
|
|
TARG=${INFO[3]}
|
|
|
|
|
BRANCH=${INFO[5]}
|
|
|
|
|
|
|
|
|
|
# If the branch isn't currently the PR target
|
|
|
|
|
if [[ $TARG != $BRANCH ]]; then
|
|
|
|
|
git fetch upstream
|
|
|
|
|
git rebase upstream/$TARG && git rebase -i upstream/$TARG
|
|
|
|
|
fi
|
