[mcguire]

Amending commits and rebasing involve the staging area?

[dahart]

Usually. You can also amend and rebase remote commits, but that’s usually a big no-no.