Browse Source

Tweaks to git helpers

Scott Lahteine 4 years ago
parent
commit
d4a5b10133
2 changed files with 4 additions and 6 deletions
  1. 2
    1
      buildroot/share/git/mfinfo
  2. 2
    5
      buildroot/share/git/mfrb

+ 2
- 1
buildroot/share/git/mfinfo View File

@@ -49,7 +49,8 @@ while [[ $# -gt 0 ]]; do
49 49
 done
50 50
 
51 51
 case "$REPO" in
52
-  Marlin              ) TARG=bugfix-1.1.x ; [[ $INDEX == 2 ]] && TARG=bugfix-2.0.x ; [[ $INDEX == 3 ]] && TARG=dev-2.1.x ;;
52
+  Marlin              ) TARG=bugfix-2.0.x ; [[ $INDEX == 1 ]] && TARG=bugfix-1.1.x ; [[ $INDEX == 3 ]] && TARG=dev-2.1.x ;;
53
+  Configurations      ) TARG=import-2.0.x ;;
53 54
   MarlinDocumentation ) TARG=master ;;
54 55
 esac
55 56
 

+ 2
- 5
buildroot/share/git/mfrb View File

@@ -23,8 +23,5 @@ done
23 23
 
24 24
 [[ $USAGE == 1 ]] && { echo "usage: `basename $0` [1|2|3]" 1>&2 ; exit 1 ; }
25 25
 
26
-# If the branch isn't currently the PR target
27
-if [[ $TARG != $CURR ]]; then
28
-  [[ $QUICK ]] || git fetch upstream
29
-  git rebase upstream/$TARG && git rebase -i upstream/$TARG
30
-fi
26
+[[ $QUICK ]] || git fetch upstream
27
+git rebase upstream/$TARG && git rebase -i upstream/$TARG

Loading…
Cancel
Save