More Rebase Commands
Reword, drop and reorder.
Squash is just one option in that to do list. There are a few more, and they're all just as simple.

- The todo list has more commands
- Reword, drop, fixup
- Reorder lines too
Todo list commands
Pick keeps a commit as it is. Reword keeps it, but lets you change the message. Squash combines it with the one above, and lets you edit the combined message. Fixup combines it too, but silently throws away its message. And drop deletes the commit completely. You can also move lines up or down, to reorder commits.
| Command | What it does |
|---|---|
| pick | keep the commit |
| reword | keep it, change the message |
| squash | combine, edit the message |
| fixup | combine, discard its message |
| drop | delete the commit |
Stay safe
Interactive rebase rewrites history, so the golden rule applies. Only use it on commits you haven't pushed, or on your own branch that nobody else uses. And if anything goes wrong, git rebase dash dash abort, or the reflog, will save you.
Summary
Pick, reword, squash, fixup and drop let you polish commits before sharing. Next, copying a single commit from one branch to another.
Key takeaways- reword: new message
- fixup: silent squash
- drop: delete