diff options
Diffstat (limited to '.tools')
| -rwxr-xr-x | .tools/scripts/init.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.tools/scripts/init.sh b/.tools/scripts/init.sh index dc333fa64..27923c6e8 100755 --- a/.tools/scripts/init.sh +++ b/.tools/scripts/init.sh @@ -178,9 +178,12 @@ function do_init { cd .. git diff master s20190408 > x.diff ls - head x.diff - tail x.diff - git apply x.diff + head -n 25 x.diff + tail -n 40 x.diff + git apply --reject --whitespace=nowarn x.diff + echo "====================================== DIFFED" + git status + echo "====================================== Continuing..." cd src check_error $? gitclone https://gitlab.com/TMW2 evol-hercules.git evol ; cd evol ; git checkout tmw2 ; cd .. |