Interactive rebase (git rebase -i) - Step-by-Step Execution

Process Flow - Interactive rebase (git rebase -i)

Start: git rebase -i HEAD~3

↓

Open editor with last 3 commits

↓

User edits commands (pick, squash, reword)

↓

Save and close editor

↓

Git applies commits one by one

↓

If conflict

↓

Resolve conflict

↓

git rebase --continue

↓

Rebase finishes successfully

↓

Updated commit history

Interactive rebase lets you edit, reorder, squash, or fix commits by opening an editor and applying changes step-by-step.

Execution Sample

Git

git rebase -i HEAD~3
# Edit commands in editor
# Save and close
# Resolve conflicts if any
# git rebase --continue

This command starts an interactive rebase of the last 3 commits allowing you to modify commit history.

Process Table

Step	Action	Editor Content	Git Applies	Result
1	Run 'git rebase -i HEAD~3'	Shows last 3 commits with 'pick' commands	No commits applied yet	Editor open for user commands
2	User changes second commit from 'pick' to 'squash'	First commit pick, second squash, third pick	No commits applied yet	Waiting for user to save and close editor
3	User saves and closes editor	Commands accepted	Git applies first commit	First commit applied successfully
4	Git applies second commit (squash)	Squashes second commit into first	Combines commit messages	Commit history updated with combined commit
5	Git applies third commit	Pick third commit	Third commit applied	All commits applied successfully
6	Rebase complete	No editor	No action	Commit history rewritten with changes

💡 All commits applied or combined; rebase finished successfully

Status Tracker

Variable	Start	After Step 3	After Step 4	After Step 5	Final
Commit History	C1 - C2 - C3	C1 - C2 - C3	C1+2 (squashed) - C3	C1+2 - C3	C1+2 - C3 (final)
Editor State	Closed	Closed	Closed	Closed	Closed
Rebase Status	Not started	Applying commits	Applying commits	Applying commits	Finished

Key Moments - 3 Insights

Why does git open an editor during interactive rebase?

Git opens the editor to let you choose what to do with each commit (pick, squash, reword). This is shown in execution_table step 1 and 2.

What happens if you change 'pick' to 'squash' for a commit?

The commit is combined with the previous one, merging their changes and messages. See execution_table step 4 for this action.

How do you continue the rebase after resolving conflicts?

You run 'git rebase --continue' to tell git to proceed applying commits. This is part of the flow after conflicts, shown in concept_flow.

Visual Quiz - 3 Questions

Look at the execution table, what is the commit history after step 4?

A C1 - C3

B C1 - C2 - C3

C C1+2 (squashed) - C3

D C2 - C3

💡 Hint

Check the 'Commit History' row in variable_tracker after step 4

At which step does the user save and close the editor?

A Step 1

B Step 3

C Step 2

D Step 5

💡 Hint

Look at the 'Action' column in execution_table where editor commands are accepted

If the user changes all 'pick' commands to 'reword', what changes in the process?

A Git prompts to edit commit messages one by one

B Commits are reordered

C Commits are combined

D Rebase stops immediately

💡 Hint

Recall what 'reword' means in interactive rebase and how git applies commits

Concept Snapshot

git rebase -i HEAD~N
- Opens editor with last N commits
- Commands: pick, squash, reword, etc.
- Save and close to apply changes
- Resolve conflicts if any, then git rebase --continue
- Rewrites commit history interactively

Full Transcript

Interactive rebase with 'git rebase -i' lets you change commit history by opening an editor showing recent commits. You can pick, squash, or reword commits. After editing commands, git applies commits one by one, combining or changing them as instructed. If conflicts occur, you resolve them and continue. This process updates your commit history cleanly and interactively.