-
- Joined
- Mar 22, 2026
-
- Messages
- 434
-
- Reaction score
- 10
-
- Points
- 0
Managing a clean Git history is essential for collaborative software development. While
When to Use Interactive Rebase
Interactive rebase is best used for local commits that have not yet been shared with others. Common use cases include:
Step-by-Step Guide
To start an interactive rebase session for the last N commits, run the following command in your terminal:
This opens your default text editor with a list of the last four commits, listed in chronological order from oldest (top) to newest (bottom). The file looks something like this:
Common Actions and Commands
1. Squashing Commits (
If you want to combine
Save and close the editor. Git will then prompt you to combine the commit messages into a single, cohesive message.
2. Rewording (
If a commit message has a typo or isn't descriptive enough, change
3. Dropping (
If a commit contains unwanted changes or debugging code you no longer need, simply change
Resolving Conflicts During Rebase
Sometimes, combining or editing commits introduces merge conflicts. If this happens, Git pauses the rebase and asks you to resolve the conflicts manually.
1. Open the affected files and fix the conflict markers.
2. Stage the resolved files using:
3. Continue the rebase process without starting a new rebase command:
If things go wrong and you want to completely abort the process and return to your original state, you can run:
Best Practices
git merge preserves every single commit and creates a branch bubble in the history graph, git rebase -i (interactive rebase) allows you to rewrite, squash, reorder, and clean up your commits before pushing them to a shared remote repository.When to Use Interactive Rebase
Interactive rebase is best used for local commits that have not yet been shared with others. Common use cases include:
- Combining multiple "WIP" (Work in Progress) commits into a single, logical commit.
- Rewording commit messages for better clarity and adherence to team standards.
- Dropping experimental commits that are no longer needed.
Step-by-Step Guide
To start an interactive rebase session for the last N commits, run the following command in your terminal:
Bash:
git rebase -i HEAD~4This opens your default text editor with a list of the last four commits, listed in chronological order from oldest (top) to newest (bottom). The file looks something like this:
Code:
pick f7f3f6d Initial project setup
pick 310154e Added user authentication
pick a54c302 WIP: fixed bug in login
pick c0ffee1 Final styling updates
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup <commit> = like "squash", but discard this commit's log message
# d, drop <commit> = remove commitCommon Actions and Commands
1. Squashing Commits (
s or squash):If you want to combine
a54c302 into 310154e, change the word pick to squash (or s) next to the commit you want to absorb:
Code:
text
pick f7f3f6d Initial project setup
pick 310154e Added user authentication
squash a54c302 WIP: fixed bug in login
pick c0ffee1 Final styling updatesSave and close the editor. Git will then prompt you to combine the commit messages into a single, cohesive message.
2. Rewording (
r or reword):If a commit message has a typo or isn't descriptive enough, change
pick to reword. The rebase process will pause on that specific commit, allowing you to type a new message.3. Dropping (
d or drop):If a commit contains unwanted changes or debugging code you no longer need, simply change
pick to drop or delete the entire line from the editor.Resolving Conflicts During Rebase
Sometimes, combining or editing commits introduces merge conflicts. If this happens, Git pauses the rebase and asks you to resolve the conflicts manually.
1. Open the affected files and fix the conflict markers.
2. Stage the resolved files using:
Code:
bash
git add <file-name>
Code:
bash
git rebase --continueIf things go wrong and you want to completely abort the process and return to your original state, you can run:
Bash:
git rebase --abortBest Practices
- Never rebase commits that have already been pushed to a public or shared branch, as it alters the commit hashes and forces other developers to reset their local branches.
- Keep your commit history atomic by squashing minor fixups before merging into
mainordevelop.