Merge commit 'rammstein/master'

Conflicts:

	sync.sh

diff --git a/sync.sh b/sync.sh
index 88b59e296cddb7a0018ea49c754a1fe14baa003f..e76ce8e55a149d9af664291dfc6032f9fb06f8fb 100755 (executable)
--- a/sync.sh
+++ b/sync.sh
@@ -31,8 +31,11 @@ for project in `find . -name .git -type d`; do
 
     # 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