sync a forked repo

forksync.sh

git remote -v

git remote add upstream https://github.com/scala/scala.github.com.git

git fetch upstream

git checkout master

git merge (or rebase) upstream/master

git push origin master

squash:
- To squash four commits into one, do the following:
git rebase -i HEAD~4
- replace the words "pick" with "squash" next to the commits you want to squash into the commit before it
git push origin branch-name --force

- https://github.com/ginatrapani/todo.txt-android/wiki/Squash-All-Commits-Related-to-a-Single-Issue-into-a-Single-Commit