summaryrefslogtreecommitdiff
path: root/all-update.sh
diff options
context:
space:
mode:
Diffstat (limited to 'all-update.sh')
-rwxr-xr-xall-update.sh6
1 files 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