git rebase workflow

git checkout public_branch
git pull
git checkout -b local_branch

# do stuff here

git fetch origin
git rebase origin/public_branch
git checkout public_branch
git pull
git rebase local_branch
git push

Reference:
https://randyfay.com/content/rebase-workflow-git