Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --git a/make.sh b/make.sh
index 3307e9e59f38d2fa18ab379dd8ceb16fe1304dfc..d6e235a7bed8f0eb37676cec11042f20dfa289e9 100755 (executable)
--- 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 9eb7219532166a826c163ff552551c0b1d5a6c53..a357d0620122dac818e1e90b4c20577aa61a9e42 100644 (file)
--- 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"