diff options
author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2013-08-24 07:30:00 +0000 |
---|---|---|
committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2013-08-24 07:30:00 +0000 |
commit | 57d5490e384038e3e2aa18c32ea543af8558a6d9 (patch) | |
tree | 935d3759e63d7c537c3aa259e0a6f80c2f4d8709 | |
parent | 42d1913b6dc16ecf42e1f2b64120307475c5d02b (diff) | |
download | morphs-baserock/ps/update-test.tar.gz |
no git output, and new branch for updatedbaserock/ps/update-test
-rwxr-xr-x | all-update.sh | 6 |
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 |