From: Simon Ruderich <simon@ruderich.org>
Date: Sat, 3 Apr 2010 00:11:38 +0000 (+0200)
Subject: update.sh: Fix branch selection.
X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=commitdiff_plain;h=b7fc39f19a54a72b5dfe28c6a4bb6c14a8317110

update.sh: Fix branch selection.
---

diff --git a/update.sh b/update.sh
index d6a1b4d..d65bd69 100755
--- 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