-
- Joined
- Mar 22, 2026
-
- Messages
- 434
-
- Reaction score
- 10
-
- Points
- 0
Using
Getting Started
To start an interactive rebase for the last $N$ commits, use the following command:
This opens your default text editor with a list of the last $N$ commits, listed in chronological order from oldest (top) to newest (bottom). Each line starts with a command (default is
Common Commands Explained
Step-by-Step Squashing Example
Suppose you made three messy commits and want to merge them into one clean feature commit:
1. Run
2. Change the text editor content from:
to:
3. Save and close the editor. Git will apply the changes and prompt you to confirm or edit the final combined commit message.
Handling Conflicts During Rebase
If conflicts arise while rebasing, Git will pause the process. Resolve the conflicts in your code, stage the resolved files using
If things go sideways and you want to abort the entire process and return to your original state, simply run:
git rebase -i is one of the best ways to clean up your commit history before pushing to a shared repository. It allows you to squash multiple commits, reorder them, edit commit messages, or drop unwanted changes entirely.Getting Started
To start an interactive rebase for the last $N$ commits, use the following command:
Bash:
git rebase -i HEAD~NThis opens your default text editor with a list of the last $N$ commits, listed in chronological order from oldest (top) to newest (bottom). Each line starts with a command (default is
pick) followed by the commit hash and message.Common Commands Explained
pick(p): Keep the commit as is.reword(r): Keep the commit, but let you change the commit message.edit(e): Stop at this commit to amend it with new changes or split it.squash(s): Combine this commit into the previous one, blending their commit messages.fixup(f): Likesquash, but discard this commit's message and keep only the previous one.drop(d): Remove the commit completely.
Step-by-Step Squashing Example
Suppose you made three messy commits and want to merge them into one clean feature commit:
1. Run
git rebase -i HEAD~3.2. Change the text editor content from:
Code:
text
pick f7a4c93 Added login button
pick 2b5e810 Fixed typo in login
pick 9c1a3f4 Added unit tests for login
Code:
text
pick f7a4c93 Added login button
fixup 2b5e810 Fixed typo in login
fixup 9c1a3f4 Added unit tests for loginHandling Conflicts During Rebase
If conflicts arise while rebasing, Git will pause the process. Resolve the conflicts in your code, stage the resolved files using
git add <file>, and then continue the rebase with:
Bash:
git rebase --continueIf things go sideways and you want to abort the entire process and return to your original state, simply run:
Bash:
git rebase --abort