Squashing commits in Git - Cheat Sheet & Quick Revision

Recall & Review

beginner

What does 'squashing commits' mean in Git?

Squashing commits means combining multiple commits into one to make the history cleaner and easier to understand.

beginner

Which Git command is commonly used to squash commits?

The command 'git rebase -i' (interactive rebase) is used to squash commits by editing the commit list.

beginner

What is the main benefit of squashing commits before merging a feature branch?

It keeps the main branch history clean and easier to read by combining many small changes into one meaningful commit.

intermediate

In an interactive rebase, what keyword do you replace 'pick' with to squash a commit?

You replace 'pick' with 'squash' or 's' to combine that commit with the previous one.

intermediate

True or False: Squashing commits changes the commit history and can affect shared branches.

True. Squashing rewrites history, so it should be done carefully, especially if the branch is shared with others.

What is the purpose of squashing commits in Git?

A To combine multiple commits into one for a cleaner history

B To delete commits permanently

C To create a new branch

D To push commits to remote

Squashing combines commits to simplify the commit history.

Which command starts an interactive rebase to squash commits?

A git merge --squash

B git commit --amend

C git rebase -i

D git reset --hard

'git rebase -i' opens the interactive rebase editor to squash commits.

During interactive rebase, which keyword do you use to squash a commit?

A fixup

B edit

C drop

D squash

'squash' merges the commit with the previous one.

What should you be careful about when squashing commits on a shared branch?

A It rewrites history and can confuse collaborators

B It can cause merge conflicts

C It deletes the branch

D It disables pushing

Squashing rewrites history, so it can cause problems if others use the branch.

What happens to commit messages when you squash commits?

A They are all deleted

B You can combine and edit them into one message

C They remain separate

D They are automatically replaced with the first commit message

During squash, Git lets you edit and combine commit messages into one.

Explain the process of squashing commits using interactive rebase in Git.

Think about editing commits in a list and merging them.

Why is it important to squash commits before merging a feature branch into the main branch?

Consider how commit history looks to others.