diff --git a/make.sh b/make.sh index 3307e9e59..d6e235a7b 100755 --- a/make.sh +++ b/make.sh @@ -905,6 +905,8 @@ othersrc) git) case "$2" in update|up) + ## REMOVES ALL UNCOMMITTED CHANGES! + [ "$3" == "--force" ] && git checkout -f git pull ;; commit|ci) diff --git a/tools/make-functions b/tools/make-functions index 9eb721953..a357d0620 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -496,7 +496,7 @@ batch_script() { $0 clean evaluate 1 - $0 git update + $0 git update --force evaluate 1 mail_me UPDATE echo "### EXPORT SOURCES"