Added a --force flag to guarantee a successful pull.

[people/pmueller/ipfire-2.x.git] / make.sh

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)