rebase todo list

The text file an interactive rebase opens, one line per commit, where the first word says what to do with that commit.

In more detail

pick keeps a commit as it is, reword keeps it but lets you edit the message, squash melds it into the commit above, fixup does the same and discards its message, and drop removes it. Reordering the lines reorders the commits. Git keeps the file as .git/rebase-merge/git-rebase-todo while the rebase runs.

Examples

pick 1a2b3c4 Add login button
squash 5d6e7f8 Fix button alignment

Related terms

Taught in

References