summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sherwood <paul.sherwood@codethink.co.uk>2013-08-24 06:04:17 +0000
committerPaul Sherwood <paul.sherwood@codethink.co.uk>2013-08-24 06:04:17 +0000
commit31379241b1c20c7839d0b1fecca1ff5778979f06 (patch)
tree3c889020bb989ea8c81eafd2b61e743cd798d0c9
parentda48082fda44cf26d1113aeccdf72698294f5af0 (diff)
downloadmorphs-31379241b1c20c7839d0b1fecca1ff5778979f06.tar.gz
clearer sucess/fail message
-rwxr-xr-xall-update.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/all-update.sh b/all-update.sh
index 9f5993d..cb1e559 100755
--- a/all-update.sh
+++ b/all-update.sh
@@ -56,6 +56,8 @@ for repo in $repos; do
git merge master
if [ $? != "0" ]; then
git reset --hard $startpoint
- echo merge failed for $repo
+ echo $repo merge failed
+ else
+ echo $repo merge successful
fi
done