FWIW, this is what I have been telling people who are new to get. The only reason I think this is better is it will work with any number of commits and doesn't require interactive. Thoughts?

git fetch
git rebase origin/master
git reset origin/master
git commit -as
git push origin -f

The only thing I don't know about is I don't typically work in a fork. For people on a fork, is it still origin/master? Or something else?

Thoughts?

I have upstream/master for the fork. I think in general, it's hard to give a perfect config agnostic setup, since you might name the remote foo and it would be foo/master.

I agree a soft reset is probably more direct. There's two reasons I didn't advice to do it here:

1. It's awesome to learn about the Swiss army knife of interactive rebase if you are new to git, it opens up lots of options later.

2. The flow you describe is adding a origin/master rebase, which may be desired, but is technically not needed.

I don't mind if you want to recommend that instead, just giving the motivation I had in mind.

Nah it's fine, just throwing it out there.

OK, let's see if folks find what I put in simple enough. If not, we can improve in a followup PR.