From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 27 Aug 2010 07:44:58 +0000 (+0200)
Subject: ./all clean: also back out of merge conflicts
X-Git-Tag: xonotic-v0.1.0preview~260
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=8fa0fcb4cb1e63a3f008ba9024c862716e79beb5;ds=sidebyside

./all clean: also back out of merge conflicts
---

diff --git a/all b/all
index 1296bdae..155cc5e6 100755
--- 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
 				.)