update.sh: Fix branch selection.

diff --git a/update.sh b/update.sh
index d6a1b4d3cda36dc99b8697d9bfa2c09b18b84a7a..d65bd69f2887fbedb0c945f313909a45b49bc85f 100755 (executable)
--- a/update.sh
+++ b/update.sh
@@ -12,7 +12,7 @@ for path in `find . -name .git -type d`; do
     # to make sure all configuration files get updated.
     if `git branch | grep *\ master > /dev/null`; then
         echo $path:
-        for branch in `git branch -a | grep remotes`; do
+        for branch in `git branch -r`; do
             echo "  merging: $branch"
             git merge $branch
         done