Summary - Interactive rebase

Combine interactive rebase commands to rewrite history.

Summary: Interactive rebase

Interactive rebase is a powerful tool for reorganizing commit history. pick keeps a commit, reword changes its message, squash combines it with the previous commit, edit pauses for modifications, and drop removes a commit.

git rebase -i HEAD~5

After editing the todo list, complete the steps requested by Git. When the operation pauses, you can modify changes; when ready, use git rebase --continue.

Exercise Turn multiple commits into one entry

Start an interactive rebase for the last four commits. In the todo list, keep the first commit and combine the next three commits with the previous entry. Use the commit IDs and descriptions below.

Show example solution

git rebase -i HEAD~4
pick a10bc20 Add invoice model
squash b20cd30 Add invoice validation
squash c30de40 Add invoice tests
squash d40ef50 Fix invoice labels

Test yourself

You want to remove an unnecessary temporary commit from a feature branch while keeping the other commits. Which todo operation should you use?
- edit
- squash
- reword
- drop
Show answer

drop — drop removes the selected commit from the rewritten history while the other commits are handled according to the todo list.
Start an interactive rebase session
```
git ____
```
Show answer
```
git rebase -i HEAD~6
```
Combine interactive rebase commands

pick

Replay the commit
reword

Rewrite the message
squash

Combine with the previous entry
drop

Remove the entry from history

Next lesson: git bisect

We Are Enhancing Your Experience

Cookie Preferences

Strictly Necessary Cookies

Analytical Cookies