Editing commit messages with rebase in Git - Interactive Code Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the command to start an interactive rebase for the last 3 commits.

Git

git rebase -i HEAD~[1]

Drag options to blanks, or click blank then click option'

A5

B2

C3

D4

Attempts:

3 left

💡 Hint

Common Mistakes

Using HEAD~2 or HEAD~4 instead of HEAD~3.

Forgetting the -i flag for interactive rebase.

The command git rebase -i HEAD~3 starts an interactive rebase for the last 3 commits.

2fill in blank

medium

Complete the command to change the commit message of a commit during rebase.

Git

In the rebase todo list, replace 'pick' with '[1]' to edit the commit message.

Drag options to blanks, or click blank then click option'

Adrop

Bedit

Csquash

Dfixup

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'squash' or 'fixup' instead of 'edit' to change messages.

Not replacing 'pick' with any command.

Replacing 'pick' with 'edit' allows you to stop at that commit and change its message.

3fill in blank

hard

Fix the error in the command to continue rebase after editing a commit message.

Git

After editing the commit message, run 'git [1] --continue' to proceed.

Drag options to blanks, or click blank then click option'

Arebase

Bpush

Ccommit

Dmerge

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'git commit --continue' or 'git push --continue'.

Using 'git merge --continue' which is for merges, not rebase.

The correct command is git rebase --continue to proceed after editing a commit.

4fill in blank

hard

Fill both blanks to create a dictionary comprehension that maps commit hashes to their messages, filtering commits with messages containing 'fix'.

Git

{commit.[1]: commit.[2] for commit in commits if 'fix' in commit.message}

Drag options to blanks, or click blank then click option'

Ahexsha

Bauthor

Cmessage

Ddate

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'author' or 'date' instead of 'hexsha' or 'message'.

Confusing commit attributes.

Use commit.hexsha for commit hash and commit.message for the commit message.

5fill in blank

hard

Fill all three blanks to write a git command that amends the last commit with a new message without changing the commit content.

Git

git commit --amend -m "[1]" && git [2] origin [3]

Drag options to blanks, or click blank then click option'

AUpdated commit message

Bpush

CHEAD

Dpull

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'pull' instead of 'push' after amending.

Not specifying the branch or HEAD when pushing.

The command amends the last commit message and pushes the updated commit to the remote branch HEAD.

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