From 57d5490e384038e3e2aa18c32ea543af8558a6d9 Mon Sep 17 00:00:00 2001
From: Paul Sherwood <paul.sherwood@codethink.co.uk>
Date: Sat, 24 Aug 2013 07:30:00 +0000
Subject: no git output, and new branch for updated

---
 all-update.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/all-update.sh b/all-update.sh
index 0d80807..e2a098b 100755
--- a/all-update.sh
+++ b/all-update.sh
@@ -55,7 +55,7 @@ for repo in $repos; do
     echo merging master into $repo 
     git checkout origin/master
     startpoint=`git rev-parse HEAD`                          
-    git merge $branch
+    CMD=`git merge $branch > /dev/null 2>&1`
     if [ $? != "0" ]; then
          git reset --hard $startpoint
          git checkout $branch
@@ -63,7 +63,7 @@ for repo in $repos; do
     else 
          echo $repo merge successful
          git branch -D $branch
-         git branch $branch
-         git checkout $branch
+         git branch $branch/updated
+         git checkout $branch/updated
     fi
 done
-- 
cgit v1.2.1