Marlin_Firmware/buildroot/share/git/mfrb

21 lines
421 B
Plaintext
Raw Normal View History

#!/usr/bin/env bash
#
# mfrb
#
# Do "git rebase -i" against the "target" branch (RCBugFix or dev)
#
MFINFO=$(mfinfo) || exit
IFS=' ' read -a INFO <<< "$MFINFO"
case "$#" in
0 ) ;;
* ) echo "Usage: `basename $0`" 1>&2 ; exit 1 ;;
esac
2017-05-05 00:46:39 -05:00
# If the branch isn't currently the PR target
2017-05-05 14:14:13 -05:00
if [[ ${INFO[3]} != ${INFO[4]} ]]; then
2017-05-05 00:46:39 -05:00
git fetch upstream
git rebase upstream/${INFO[3]} && git rebase -i upstream/${INFO[3]}
fi