Rebase

Squash and reorder commits with interactive rebase.

Interactive Rebase

Interactive rebase is used to reorganize a branch's commit history. With git rebase -i, you can list, combine, or reorder commits. It is especially useful for editing commit history that has not been shared yet.

git rebase -i HEAD~3

The command opens an editing list for the last three commits.

Exercise Squash Commits

Start an interactive rebase for the last three commits. Leave the first commit as pick and change the next two commits to squash. This combines the three commits into one.

Show example solution

git rebase -i HEAD~3
# Düzenleme listesi:
pick a1b2c3d İlk değişiklik
squash d4e5f6a İkinci değişiklik
squash 7a8b9c0 Üçüncü değişiklik

Exercise Reorder Commit History

Start an interactive rebase for the last four commits. Arrange the commits in this order: a1b2c3d, then 7a8b9c0, followed by d4e5f6a, and finally e1f2a3b. Keep the operation as pick on every line.

Show example solution

git rebase -i HEAD~4
# Düzenleme listesi:
pick a1b2c3d İlk commit
pick 7a8b9c0 Üçüncü commit
pick d4e5f6a İkinci commit
pick e1f2a3b Son commit

Test yourself

Which operation is used to combine a commit with the previous commit during an interactive rebase?
- edit
- squash
- reword
- drop
Show answer

squash — <code>squash</code> combines the selected commit's changes with the previous commit.

Reorder Commits

git rebase -i HEAD~4
# Düzenleme listesinde commit satırlarını yeniden sırala
# Kaydet ve kapat____

Show answer

git rebase -i HEAD~4
# Düzenleme listesinde commit satırlarını yeniden sırala
# Kaydet ve kapatyeniden sırala

Interactive Rebase Operations

pick

Applies the commit as it is
squash

Combines commits
reword

Changes the commit message
drop

Removes a commit from history

Next lesson: Bisect

We Are Enhancing Your Experience

Cookie Preferences

Strictly Necessary Cookies

Analytical Cookies