https://gist.github.com/CristinaSolana/1885435

## sync with master trunk
git clone git@github.com:jdgetter/orchard.git
cd orchard
git remote add upstream git@github.com:theorchard/database.git
git fetch upstream
git pull upstream master
git push


## squash commits
git rebase -i HEAD~2
<<CHANGE 'pick' to 's'>>
git push origin HEAD -f