bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🔨 Update git helper scripts

Browse Source
This commit is contained in:
Scott Lahteine
2021-11-03 07:02:21 -05:00
committed by Scott Lahteine
parent 20c747753d
commit 5efef86cfa
6 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buildroot/share/git/mfrb
View File

@ -2,7 +2,7 @@
#
# mfrb
#
# Do "git rebase -i" against the "target" branch (bugfix-1.1.x, bugfix-2.0.x, dev-2.1.x, or master)
# Do "git rebase -i" against the repo's "target" branch
#
MFINFO=$(mfinfo "$@") || exit 1
@ -21,7 +21,7 @@ while [ $IND -lt ${#INFO[@]} ]; do
let IND+=1
done
[[ $USAGE == 1 ]] && { echo "usage: `basename $0` [1|2|3]" 1>&2 ; exit 1 ; }
[[ $USAGE == 1 ]] && { echo "usage: `basename $0` [1|2]" 1>&2 ; exit 1 ; }
[[ $QUICK ]] || git fetch upstream
git rebase upstream/$TARG && git rebase -i upstream/$TARG