./all clean: also back out of merge conflicts

2025-01-18 20:21:18 +00:00 · 2010-08-27 09:44:58 +02:00 · 2010-08-27 09:44:58 +02:00 · 8fa0fcb4cb
commit 8fa0fcb4cb
parent 1ed9707eaf
1 changed files with 3 additions and 2 deletions
--- a/5
+++ b/5
@ -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
 				.)