zwnk/Marlin_Ender3
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

first

Browse source
This commit is contained in:
dfriedrich 2019-03-21 10:43:51 -03:00
commit 60ece440f6
553 changed files with 361616 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
buildroot/share/git/mfrb Normal file
View file

@ -0,0 +1,19 @@
#!/usr/bin/env bash
#
# mfrb
#
# Do "git rebase -i" against the "target" branch (bugfix-1.1.x, bugfix-2.0.x, or master)
#
[[ $# < 2 && $1 != "-h" && $1 != "--help" ]] || { echo "Usage: `basename $0` [1|2]" 1>&2 ; exit 1; }
MFINFO=$(mfinfo "$@") || exit 1
IFS=' ' read -a INFO <<< "$MFINFO"
TARG=${INFO[3]}
CURR=${INFO[5]}
# If the branch isn't currently the PR target
if [[ $TARG != $CURR ]]; then
git fetch upstream
git rebase upstream/$TARG && git rebase -i upstream/$TARG
fi