reword
keyword edit
keyword in the rebase scriptgit reset HEAD^
back at the terminal to unstage changesgit rebase --continue
squash
keyword to push one or more commits into the previous, and change the previous' commit messagefixup
keyword to push one or more commits into the previous without changing the previous' commit message