git status -> git diff
echo "rebuilding workspace"
better messages
Merge pull request #2 from mohamed-barakat/master

git status -> git diff