don't abort completely if git pull gitake'd
authorRudolf Polzer <divverent@alientrap.org>
Sun, 25 Apr 2010 20:22:19 +0000 (22:22 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 25 Apr 2010 20:22:19 +0000 (22:22 +0200)
all

diff --git a/all b/all
index 9a0a6d0ca0041aafda51f3dc693d65dd34a57737..e19793567a34d224808a78fc4e1832b49a508248 100755 (executable)
--- a/all
+++ b/all
@@ -166,7 +166,8 @@ case "$cmd" in
                                if git config branch.$r.remote >/dev/null 2>&1; then
                                        if ! verbose git pull; then
                                                check_mergeconflict "$d"
                                if git config branch.$r.remote >/dev/null 2>&1; then
                                        if ! verbose git pull; then
                                                check_mergeconflict "$d"
-                                               exit 1 # FATAL
+                                               echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
+                                               read -r DUMMY
                                        fi
                                fi
 
                                        fi
                                fi