diff options
Diffstat (limited to 'dts/scripts/cronjob')
| -rwxr-xr-x | dts/scripts/cronjob | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dts/scripts/cronjob b/dts/scripts/cronjob index ccdbc0607e..f01166b8e4 100755 --- a/dts/scripts/cronjob +++ b/dts/scripts/cronjob @@ -84,7 +84,7 @@ TESTBRANCH=test-${DATE} MERGE_OUTPUT=`( set -e git checkout -b ${TESTBRANCH} origin/master -git merge --no-edit upstream/dts +git -c merge.renameLimit=1000000 merge --no-edit upstream/dts ) 2>&1 ` REF=$(git show-ref --verify refs/heads/${TESTBRANCH}) echo "Testing: ${REF}" |