From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 25 Apr 2010 20:22:19 +0000 (+0200)
Subject: don't abort completely if git pull gitake'd
X-Git-Tag: xonotic-v0.1.0preview~484
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=27fd916063a5cd6f7de90d4b976fc4108ae51a6c

don't abort completely if git pull gitake'd
---

diff --git a/all b/all
index 9a0a6d0c..e1979356 100755
--- 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"
-						exit 1 # FATAL
+						echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
+						read -r DUMMY
 					fi
 				fi