./all clean: also back out of merge conflicts

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 050516b519b871edd3364f5d4f9356bab770f435..155cc5e6a701f40eaeac0cc2f60ce3999e47d0c2 100755 (executable)
--- a/all
+++ b/all
@@ -205,6 +205,9 @@ listrepos()
                                continue
                                ;;
                esac
+               # default: enable
+               msg "Repository $d enabled by default"
+               echo "$d"
        done
 }
 
@@ -901,9 +904,10 @@ case "$cmd" in
                        force=true
                fi
                for d in $repos; do
-                       enter "$d0/$d" verbose
+                       verbose cd "$d0/$d"
                        if $force; then
-                               verbose git checkout-index -fa
+                               verbose git reset --hard
+                               #redundant# verbose git checkout-index -fa
                        fi
                        case "$d" in
                                .)