./all clean: also back out of merge conflicts
authorRudolf Polzer <divverent@alientrap.org>
Fri, 27 Aug 2010 07:44:58 +0000 (09:44 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 27 Aug 2010 07:44:58 +0000 (09:44 +0200)
all

diff --git a/all b/all
index 1296bda..155cc5e 100755 (executable)
--- a/all
+++ b/all
@@ -904,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
                                .)