Reordering commits in Git - Cheat Sheet & Quick Revision

Recall & Review

beginner

What is the purpose of reordering commits in Git?

Reordering commits helps to organize the commit history for clarity, fix mistakes, or group related changes before sharing code.

beginner

Which Git command is used to start an interactive rebase for reordering commits?

The command git rebase -i HEAD~N starts an interactive rebase for the last N commits, allowing you to reorder them.

beginner

In the interactive rebase editor, how do you change the order of commits?

You change the order by moving the lines representing commits up or down in the editor before saving and closing it.

beginner

What does the word 'pick' mean in the interactive rebase list?

'pick' means to keep the commit as is in the new order during the rebase process.

intermediate

What should you do if you encounter conflicts during a rebase?

You should fix the conflicts manually, then run git rebase --continue to proceed with the rebase.

Which command starts an interactive rebase to reorder the last 3 commits?

A git rebase --order 3

B git reorder 3

C git commit --reorder 3

D git rebase -i HEAD~3

The correct command is git rebase -i HEAD~3 to interactively rebase the last 3 commits.

In the interactive rebase editor, how do you reorder commits?

A By changing the order of lines representing commits

B By typing new commit messages

C By deleting commits from the list

D By running git reorder command

You reorder commits by moving the lines up or down in the editor before saving.

What does the 'pick' command do in interactive rebase?

A Splits the commit

B Deletes the commit

C Keeps the commit as is

D Squashes the commit

'pick' means to keep the commit unchanged in the new order.

If a conflict happens during rebase, what is the next step?

A Fix conflicts and run git rebase --continue

B Abort the rebase immediately

C Run git commit --fix

D Restart the computer

You fix conflicts manually and then continue the rebase with git rebase --continue.

Why might you want to reorder commits before sharing your code?

A To delete all commits

B To make the commit history clearer and logical

C To speed up the computer

D To change the branch name

Reordering commits helps make the history easier to understand and review.

Explain the steps to reorder the last 4 commits in Git using interactive rebase.

Think about starting the rebase, editing commit order, and finishing the process.

Describe what happens if you reorder commits and encounter a conflict during the process.

Focus on how Git handles conflicts and how you resolve them.