Updating your dsss17 repo while preserving your changes

update.sh

# Supposing that you're starting on the master branch...

# Create a new branch and switch to it:
git checkout -b my-work

# Commit your changes on that branch:
git add .
git commit -m "My work so far!"

# Update the master branch:
git checkout master
git pull origin master

# Update your branch with the changes on master:
git checkout my-work
git rebase master