Collaboration

Rebase your changes on top of the remote master

git pull --rebase upstream master

Squash multiple commits into one for a cleaner git log

git rebase -i $commit_ref