From: Simon Ruderich <simon@ruderich.org>
Date: Wed, 18 Feb 2009 20:03:43 +0000 (+0100)
Subject: Merge commit 'rammstein/master'
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=d648243d7cce390e7321f2d45d42cdec25f295c7;p=config%2Fdotfiles.git

Merge commit 'rammstein/master'

Conflicts:

	sync.sh
---

d648243d7cce390e7321f2d45d42cdec25f295c7
diff --cc sync.sh
index 498a2b3,88b59e2..e76ce8e
--- a/sync.sh
+++ b/sync.sh
@@@ -26,13 -26,13 +26,16 @@@ for project in `find . -name .git -typ
      pwd=`pwd`
      cd "$project"
  
+     # Remove .git from repository name.
+     project=`echo "$project" | sed "s|.git||"`
+ 
      # Display all commits not in the master branch.
      if [ $method = status ]; then
 -        echo "status of $project"
 -        git log --graph --all --pretty=oneline master..
 +        output=`git log --graph --all --pretty=oneline --color master..`
 +        if [ "x$output" != x ]; then
 +            echo "$project status:"
 +            echo "$output"
 +        fi
      # Fetch from/Push to all remotes.
      else
          for remote in `git remote`; do