Interactive rebase (git rebase -i) - 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'

A4

B2

C3

D5

Attempts:

3 left

💡 Hint

Common Mistakes

Using a number too small or too large changes the commits included.

Forgetting to use -i for interactive mode.

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

2fill in blank

medium

Complete the command to edit a commit message during an interactive rebase.

Git

In the interactive rebase editor, replace 'pick' with '[1]' to edit a commit message.

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

Aedit

Bdrop

Csquash

Dfixup

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'squash' when wanting to edit a message.

Confusing 'drop' with 'edit'.

Replacing 'pick' with 'edit' allows you to pause the rebase and change the commit message or content.

3fill in blank

hard

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

Git

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

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

Acommit

Bpush

Cmerge

Drebase

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'git commit --continue' instead of 'git rebase --continue'.

Trying to use 'git push --continue' which does not exist.

The correct command is git rebase --continue to resume the rebase process after resolving conflicts or editing commits.

4fill in blank

hard

Fill both blanks to squash the second commit into the first during interactive rebase.

Git

In the interactive rebase editor, change the second commit's action from '[1]' to '[2]'.

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

Apick

Bedit

Csquash

Ddrop

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'drop' instead of 'squash' which deletes the commit.

Changing the first commit instead of the second.

To combine commits, keep the first as 'pick' and change the second to 'squash'. This merges the second commit into the first.

5fill in blank

hard

Fill all three blanks to reorder commits during an interactive rebase.

Git

In the editor, move the commit lines so that the commit with message '[1]' comes before '[2]', then save and exit with '[3]'.

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

A:wq

Bfix typo

Cadd feature

Dreorder commits

Attempts:

3 left

💡 Hint

Common Mistakes

Confusing commit messages and moving the wrong lines.

Not saving the file properly after reordering.

To reorder commits, move the line with 'add feature' before 'fix typo' in the editor, then save and exit with ':wq'.

Practice

1. What is the main purpose of using git rebase -i (interactive rebase)?

easy

A. To reorder, edit, or combine recent commits before sharing

B. To create a new branch from the current commit

C. To permanently delete the entire commit history

D. To push commits directly to the remote repository

Solution

1. Step 1: Understand the purpose of interactive rebase

   Interactive rebase allows you to change the order, combine, edit, or remove recent commits.

2. Step 2: Compare with other git commands

   Creating branches, deleting history, or pushing commits are different git operations.

3. Final Answer:

   To reorder, edit, or combine recent commits before sharing -> Option A

4. Quick Check:

   Interactive rebase = reorder/edit commits [OK]

Hint: Interactive rebase = rewrite recent commits easily [OK]

Common Mistakes:

• Confusing rebase with branch creation
• Thinking it deletes all history
• Assuming it pushes commits automatically

2. Which of the following is the correct command to start an interactive rebase for the last 3 commits?

easy

A. git rebase -i HEAD^^3

B. git rebase -i HEAD~3

C. git rebase -i HEAD~

D. git rebase -i HEAD^3

Solution

1. Step 1: Recall the syntax for interactive rebase

   The correct syntax uses HEAD~N to specify the last N commits, so HEAD~3 means last 3 commits.

2. Step 2: Check the options

   HEAD^3 and HEAD^^3 are invalid for this purpose; HEAD~ alone is incomplete.

3. Final Answer:

   git rebase -i HEAD~3 -> Option B

4. Quick Check:

   HEAD~3 selects last 3 commits [OK]

Hint: Use HEAD~N to select last N commits for rebase [OK]

Common Mistakes:

• Using HEAD^3 instead of HEAD~3
• Omitting the number after ~
• Using double carets ^^ incorrectly

3. Given the following interactive rebase todo list:

pick a1b2c3 Commit A
pick d4e5f6 Commit B
pick 789abc Commit C

If you change it to:

pick d4e5f6 Commit B
squash 789abc Commit C
pick a1b2c3 Commit A

What will happen after completing the rebase?

medium

A. Only Commit C will be applied, others dropped

B. Commits A and B will be combined, Commit C will be last

C. The rebase will fail due to invalid order

D. Commits B and C will be combined, and Commit A will be last

Solution

1. Step 1: Understand 'pick' and 'squash' in rebase

   'pick' applies a commit as is; 'squash' combines the commit with the previous one.

2. Step 2: Analyze the new order

   Commit B is picked first, Commit C is squashed into B, Commit A is picked last.

3. Final Answer:

   Commits B and C will be combined, and Commit A will be last -> Option D

4. Quick Check:

   squash merges commits; order changed [OK]

Hint: Squash merges commit into previous one in order [OK]

Common Mistakes:

• Thinking squash drops commits
• Assuming order stays same after rebase
• Confusing squash with fixup

4. You run git rebase -i HEAD~2 and change the second commit's action from pick to edit. After saving, what should you do next to modify that commit?

medium

A. Make changes, then run git commit --amend and git rebase --continue

B. Run git push immediately to update remote

C. Abort the rebase with git rebase --abort

D. Run git reset --hard HEAD~1 to undo the commit

Solution

1. Step 1: Understand 'edit' in interactive rebase

   When a commit is marked 'edit', rebase pauses to let you change it.

2. Step 2: Modify commit and continue rebase

   You make changes, amend the commit with git commit --amend, then continue with git rebase --continue.

3. Final Answer:

   Make changes, then run git commit --amend and git rebase --continue -> Option A

4. Quick Check:

   Edit = amend commit + continue rebase [OK]

Hint: Edit commit: amend changes, then continue rebase [OK]

Common Mistakes:

• Pushing before finishing rebase
• Aborting instead of continuing
• Resetting commits incorrectly

5. You want to clean up your last 4 commits by combining the second and third commits into one, and also reorder commits so the last commit becomes the first. Which interactive rebase todo list correctly achieves this?

pick 111aaa Commit 1
pick 222bbb Commit 2
pick 333ccc Commit 3
pick 444ddd Commit 4

hard

A. pick 444ddd Commit 4
squash 222bbb Commit 2
pick 333ccc Commit 3
pick 111aaa Commit 1

B. pick 444ddd Commit 4
pick 111aaa Commit 1
squash 222bbb Commit 2
pick 333ccc Commit 3

C. pick 444ddd Commit 4
pick 111aaa Commit 1
pick 222bbb Commit 2
squash 333ccc Commit 3

D. pick 111aaa Commit 1
pick 333ccc Commit 3
squash 222bbb Commit 2
pick 444ddd Commit 4

Solution

1. Step 1: Reorder commits to put last commit first

   Commit 4 (444ddd) should be first in the list to reorder it first.

2. Step 2: Combine second and third commits

   To combine commits 2 and 3, use 'pick' on commit 2 and 'squash' on commit 3 immediately after.

3. Step 3: Verify the todo list

   pick 444ddd Commit 4
   pick 111aaa Commit 1
   pick 222bbb Commit 2
   squash 333ccc Commit 3

   places commit 4 first, then commit 1, then picks commit 2 and squashes commit 3, matching requirements.

4. Final Answer:

   pick 444ddd Commit 4
   pick 111aaa Commit 1
   pick 222bbb Commit 2
   squash 333ccc Commit 3

   -> Option C

5. Quick Check:

   Reorder + squash =

   pick 444ddd Commit 4
   pick 111aaa Commit 1
   pick 222bbb Commit 2
   squash 333ccc Commit 3

   [OK]

Hint: Put last commit first, squash 3rd into 2nd commit [OK]

Common Mistakes:

• Squashing commits in wrong order
• Not moving last commit to first position
• Using squash on wrong commits