Editing commit messages with rebase in Git - Step-by-Step Execution

Process Flow - Editing commit messages with rebase

Start: Identify commits to edit

↓

Run: git rebase -i <commit>

↓

Editor opens with commit list

↓

Change 'pick' to 'reword' for target commit

↓

Save and close editor

↓

Editor opens for commit message

↓

Edit commit message

↓

Save and close editor

↓

Rebase continues and finishes

↓

Updated commit message applied

This flow shows how to start an interactive rebase, mark commits for message editing, update the message, and complete the rebase.

Execution Sample

Git

git rebase -i HEAD~3
# change 'pick' to 'reword' on second commit
# save and exit
# edit commit message
# save and exit

This sequence edits the message of the second most recent commit in the last 3 commits.

Process Table

Step	Action	Editor Content	User Input	Result
1	Run 'git rebase -i HEAD~3'	List of 3 commits with 'pick' commands	Change 'pick' to 'reword' on second commit	Marks second commit for message edit
2	Save and close editor	N/A	N/A	Rebase starts, opens editor for commit message
3	Edit commit message	Original commit message of second commit	Modify message text	Commit message updated
4	Save and close editor	N/A	N/A	Rebase continues applying commits
5	Rebase finishes	N/A	N/A	Commit messages updated, rebase complete

💡 Rebase completes after all commits are applied with updated messages

Status Tracker

Variable	Start	After Step 1	After Step 3	Final
Commit List	3 commits with original messages	Second commit marked 'reword'	Second commit message edited	Commit list with updated second commit message

Key Moments - 3 Insights

Why do we change 'pick' to 'reword' instead of editing the commit message directly?

Changing 'pick' to 'reword' tells git to pause and let you edit the commit message during rebase, as shown in execution_table step 1 and 3.

What happens if you save the editor without changing the commit message?

The commit message remains unchanged and rebase continues, as seen in execution_table step 4 and 5.

Can you edit multiple commit messages in one rebase?

Yes, by marking multiple commits with 'reword' in the editor at step 1, git will open the editor for each commit message in turn.

Visual Quiz - 3 Questions

Look at the execution table, what is the user input at step 1?

A Change 'pick' to 'reword' on the second commit

B Edit the commit message directly

C Run 'git commit --amend'

D Abort the rebase

💡 Hint

See execution_table row 1 under 'User Input'

At which step does the commit message actually get changed?

A Step 1

B Step 4

C Step 3

D Step 5

💡 Hint

Check execution_table 'Action' and 'Result' columns for when message editing happens

If you want to edit two commit messages, how would the execution table change?

A You must run rebase twice

B Step 1 would show two commits marked 'reword' and steps 3 and 4 repeat for each

C Only one commit can be edited per rebase

D The commit messages are edited automatically without user input

💡 Hint

Refer to key_moments about editing multiple commits

Concept Snapshot

git rebase -i <commit>  # start interactive rebase
Change 'pick' to 'reword' for commits to edit
Save and exit editor
Edit commit messages when prompted
Save and exit to continue rebase
Rebase finishes with updated messages

Full Transcript

To edit commit messages with git rebase, you start an interactive rebase with 'git rebase -i' and specify how many commits back to edit. In the editor that opens, you change 'pick' to 'reword' for the commits whose messages you want to change. After saving and closing, git will pause and open an editor for each commit marked 'reword' so you can edit its message. Save and close each message editor to continue the rebase. When all commits are applied, the rebase finishes with updated commit messages.

Practice

1. What does the command git rebase -i HEAD~3 allow you to do?

easy

A. Delete the last 3 commits permanently

B. View the commit history without changes

C. Create 3 new commits automatically

D. Interactively edit the last 3 commits, including their messages

Solution

1. Step 1: Understand the command purpose

   git rebase -i HEAD~3 opens an interactive editor for the last 3 commits.

2. Step 2: Recognize the interactive editing feature

   It allows changing commit messages, reordering, or squashing commits.

3. Final Answer:

   Interactively edit the last 3 commits, including their messages -> Option D

4. Quick Check:

   Interactive rebase edits commits [OK]

Hint: Use -i with HEAD~N to edit last N commits [OK]

Common Mistakes:

• Thinking it deletes commits
• Assuming it creates new commits
• Confusing it with git log

2. Which line correctly changes a commit action to edit its message during an interactive rebase?

easy

A. reword abc123 Update README with new info

B. pick abc123 Fix typo in README

C. edit abc123 Add new feature

D. delete abc123 Remove unused file

Solution

1. Step 1: Identify the correct keyword for editing messages

   In interactive rebase, reword lets you change the commit message only.

2. Step 2: Compare options

   edit pauses for full commit changes, pick keeps commit as is, delete is invalid here.

3. Final Answer:

   reword abc123 Update README with new info -> Option A

4. Quick Check:

   Use 'reword' to edit message only [OK]

Hint: Change 'pick' to 'reword' to edit commit messages [OK]

Common Mistakes:

• Using 'edit' when only message change is needed
• Leaving 'pick' unchanged
• Using invalid 'delete' keyword

3. After running git rebase -i HEAD~2 and changing the first commit's action from pick to reword, what happens next?

medium

A. Git deletes the first commit

B. Git opens an editor to change the first commit message, then continues rebase

C. Git aborts the rebase immediately

D. Git merges the two commits automatically

Solution

1. Step 1: Understand 'reword' effect during rebase

   Changing 'pick' to 'reword' tells Git to pause and open the commit message editor for that commit.

2. Step 2: Follow rebase process

   After editing the message, Git continues applying remaining commits automatically.

3. Final Answer:

   Git opens an editor to change the first commit message, then continues rebase -> Option B

4. Quick Check:

   'reword' opens message editor [OK]

Hint: Reword pauses to edit message, then continues [OK]

Common Mistakes:

• Thinking rebase aborts on reword
• Assuming commits get deleted
• Expecting automatic merge without editing

4. You ran git rebase -i HEAD~2 and changed 'pick' to 'reword' for the second commit, but after saving, Git shows an error: error: could not apply abc123. What is the likely cause?

medium

A. You used 'reword' instead of 'edit'

B. You forgot to save the commit message editor

C. There is a conflict applying the second commit during rebase

D. The commit hash is invalid

Solution

1. Step 1: Understand the error message

   error: could not apply abc123 means Git failed to apply that commit, usually due to conflicts.

2. Step 2: Relate to rebase process

   During rebase, conflicts can happen if changes overlap; you must resolve them manually.

3. Final Answer:

   There is a conflict applying the second commit during rebase -> Option C

4. Quick Check:

   Apply error = conflict during rebase [OK]

Hint: Apply errors usually mean conflicts to resolve [OK]

Common Mistakes:

• Assuming 'reword' causes error by itself
• Ignoring conflict resolution step
• Thinking commit hash is wrong

5. You want to edit the commit messages of the last 4 commits but keep the commit content unchanged. Which sequence of commands and actions is correct?

hard

A. Run git rebase -i HEAD~4, change all 'pick' to 'reword', save, then edit each message when prompted

B. Run git commit --amend four times in a row

C. Run git reset --soft HEAD~4 and recommit with new messages

D. Run git rebase -i HEAD~4, change 'pick' to 'edit', then change messages and contents

Solution

1. Step 1: Choose the right rebase command

   git rebase -i HEAD~4 opens interactive rebase for last 4 commits.

2. Step 2: Use 'reword' to edit messages only

   Changing 'pick' to 'reword' lets you edit commit messages without changing content.

3. Step 3: Save and edit messages when prompted

   Git opens editor for each commit message in turn; you update and save them.

4. Final Answer:

   Run git rebase -i HEAD~4, change all 'pick' to 'reword', save, then edit each message when prompted -> Option A

5. Quick Check:

   Use 'reword' in interactive rebase for message edits only [OK]

Hint: Use 'reword' for messages, 'edit' for content changes [OK]

Common Mistakes:

• Using commit --amend repeatedly instead of rebase
• Resetting and recommitting loses history
• Using 'edit' when only message change needed