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;hp=27b94f650cd4d27bbf8bd9fc33030077a675d4d7;p=config%2Fdotfiles.git

Merge commit 'rammstein/master'

Conflicts:

	sync.sh
---

diff --git a/sync.sh b/sync.sh
index 498a2b3..e76ce8e 100755
--- a/sync.sh
+++ b/sync.sh
@@ -26,6 +26,9 @@ for project in `find . -name .git -type d`; do
     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
         output=`git log --graph --all --pretty=oneline --color master..`
@@ -43,3 +46,8 @@ for project in `find . -name .git -type d`; do
 
     cd "$pwd"
 done
+
+# Run status after a fetch to see new changes.
+if [ $method = fetch ]; then
+    ./sync.sh status
+fi