Sync and rebase

Sync live site

git checkout develop
git fetch origin

then:

git pull origin develop

or

git merge --ff-only develop

finally:

git push fork develop

To create a new branch that tracks develop on master of website

git checkout -b <new_branch_name> -t origin/develop

Rebase branch with multiple commits before final push and subsequent pull request

git checkout <branch_to_be_rebased_name>
git merge develop  (1)
git rebase -i origin/develop

1. This brings in the latest changes that occurred while you were working

In vim, delete command and put s next to commit message(s) you want squashed

:wq

Then vim goes into write mode which is where you edit the commit messages.

:wq

then q

git push fork <branch_name>

or

git push fork --force <branch_name>