My Marlin configs for Fabrikator Mini and CTC i3 Pro B
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.

mfrb 425B

12345678910111213141516171819
  1. #!/usr/bin/env bash
  2. #
  3. # mfrb
  4. #
  5. # Do "git rebase -i" against the "target" branch (RCBugFix or dev)
  6. #
  7. [[ $# == 0 ]] || { echo "Usage: `basename $0`" 1>&2 ; exit 1; }
  8. MFINFO=$(mfinfo) || exit 1
  9. IFS=' ' read -a INFO <<< "$MFINFO"
  10. TARG=${INFO[3]}
  11. BRANCH=${INFO[5]}
  12. # If the branch isn't currently the PR target
  13. if [[ $TARG != $BRANCH ]]; then
  14. git fetch upstream
  15. git rebase upstream/$TARG && git rebase -i upstream/$TARG
  16. fi