Fix typo
Add additional advice about rebasing
Use long parameter version --force rather than -f