Tweaks to git helpers

2020-09-28 03:57:09 -05:00
parent 85573909d1
commit ad3c475dd1
2 changed files with 4 additions and 6 deletions
--- a/buildroot/share/git/mfrb
+++ b/buildroot/share/git/mfrb
@ -23,8 +23,5 @@ done

 [[ $USAGE == 1 ]] && { echo "usage: `basename $0` [1|2|3]" 1>&2 ; exit 1 ; }

-# If the branch isn't currently the PR target
-if [[ $TARG != $CURR ]]; then
-  [[ $QUICK ]] || git fetch upstream
-  git rebase upstream/$TARG && git rebase -i upstream/$TARG
-fi
+[[ $QUICK ]] || git fetch upstream
+git rebase upstream/$TARG && git rebase -i upstream/$TARG