diff options
| author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2013-08-24 06:07:08 +0000 |
|---|---|---|
| committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2013-08-24 06:07:08 +0000 |
| commit | 0d291e47be076095385dac8eed4aed13b505c43f (patch) | |
| tree | da8b610c0ae1e6817c501de764e0e0892fc1d0c5 | |
| parent | 31379241b1c20c7839d0b1fecca1ff5778979f06 (diff) | |
| download | morphs-0d291e47be076095385dac8eed4aed13b505c43f.tar.gz | |
no reporting from git
| -rwxr-xr-x | all-update.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/all-update.sh b/all-update.sh index cb1e559..92f01d3 100755 --- a/all-update.sh +++ b/all-update.sh @@ -53,7 +53,7 @@ for repo in $repos; do cd $workspace/*:$repo startpoint=`git rev-parse HEAD` echo merging master into $repo - git merge master + CMD=`git merge master > /dev/null 2>&1` if [ $? != "0" ]; then git reset --hard $startpoint echo $repo merge failed |