Love this. I would add:

  git commit —-fixup $COMMIT_ID

combined with

  git rebase -i upstream/master —autosquash

These have become staples of my recent workflow. Julia’s example uses HEAD^^^^^ to rebase the previous 5 commits. I have been doing this as HEAD~5, until recently I realized you can just rebase all commits up to the upstream HEAD.