From: Simon Ruderich <simon@ruderich.org>
Date: Fri, 3 Dec 2010 11:48:25 +0000 (+0100)
Subject: Merge remote branch 'asp/master'
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=b7ff27cb60530eeebcfb9bdef1b68f548e1d88ed;p=config%2Fdotfiles.git

Merge remote branch 'asp/master'

Conflicts:
	bin/git-update.sh
---

b7ff27cb60530eeebcfb9bdef1b68f548e1d88ed
diff --cc bin/git-update.sh
index 3fea2d6,e9c0aba..de71bec
--- a/bin/git-update.sh
+++ b/bin/git-update.sh
@@@ -21,14 -13,13 +21,15 @@@ if [ x$1 != x ]; the
      cd "$1"
  fi
  
 -# Get all remote changes.
 -git remote update 2>&1 | grep -v Fetching
 -# Push all local changes to remote(s).
 -for remote in `git remote`; do
 -    git push $remote 2>&1 | grep -v 'Everything up-to-date'
 -    git push --tags $remote 2>&1 | grep -v 'Everything up-to-date'
 -done
 +if [ x$LOCAL = x ]; then
 +    # Get all remote changes.
 +    git remote update 2>&1 | grep -v Fetching
 +    # Push all local changes to remote(s).
 +    for remote in `git remote`; do
 +        git push $remote 2>&1 | grep -v 'Everything up-to-date'
++        git push --tags $remote 2>&1 | grep -v 'Everything up-to-date'
 +    done
 +fi
  # Show unmerged changes.
  git branch -rv --color --no-merged
  # Show uncommitted changes.