Merge Marlin 1.1.8

buildroot/share/git/mfnew

@@ -9,7 +9,7 @@ usage() {
   echo "Usage: `basename $0` [1|2] [name]" 1>&2
 }
 
-[[ $# < 3 && $1 != "-h" && $1 != "--help" ]] || { usage; exit 1; }
+[[ $# < 3 ]] || { usage ; exit 1 ; }
 
 MFINFO=$(mfinfo "$@") || exit 1
 IFS=' ' read -a INFO <<< "$MFINFO"
@@ -31,4 +31,4 @@ case "$#" in
 esac
 
 git fetch upstream
-git checkout --no-track upstream/$TARG -b $BRANCH
+git checkout upstream/$TARG -b $BRANCH