Interactive rebase (git rebase -i) - Cheat Sheet & Quick Revision

Recall & Review

beginner

What is the purpose of git rebase -i?

It allows you to edit, reorder, squash, or remove commits in a branch history before sharing it.

beginner

In an interactive rebase, what does the command pick mean?

It means to keep the commit as is during the rebase process.

intermediate

What does the squash command do in git rebase -i?

It combines the current commit with the previous one, merging their changes and messages.

beginner

How do you start an interactive rebase to edit the last 3 commits?

Run git rebase -i HEAD~3 to open the last 3 commits for editing.

intermediate

What happens if you reorder commits in the interactive rebase editor?

Git will replay the commits in the new order, changing the commit history accordingly.

What does git rebase -i HEAD~4 do?

A Opens the last 4 commits for interactive editing

B Deletes the last 4 commits

C Creates 4 new commits

D Pushes 4 commits to remote

The command opens the last 4 commits in an editor for interactive rebase.

Which command in the interactive rebase editor combines commits?

A pick

B edit

C drop

D squash

The 'squash' command merges a commit into the previous one.

If you want to completely remove a commit during interactive rebase, which command do you use?

A pick

B drop

C edit

D reword

The 'drop' command removes the commit from history.

What does the edit command do in an interactive rebase?

A Stops to allow changes to the commit

B Keeps the commit unchanged

C Deletes the commit

D Combines commits

The 'edit' command pauses the rebase so you can change the commit.

After finishing an interactive rebase, what should you do if you already pushed the original commits?

A Nothing, just continue working

B Delete the remote branch

C Force push the branch to update remote history

D Create a new branch

You need to force push to update the remote branch with rewritten history.

Explain how to use git rebase -i to combine two commits into one.

Think about opening commits for editing and merging them.

Describe what happens when you reorder commits during an interactive rebase.

Imagine rearranging steps in a recipe.