Git rebase is very helpful, just got to be careful not to rewrite history already pushed into a shared upstream.

Rule of thumb is to only rebase what you're pull from upstream into your fork / clone of your fork upstream.

git pull --rebase <remote> <branch-name>