Git Commands for Rebasing and Squashing

Master the art of rebasing and squashing commits in Git to keep your commit history clean and organized.

Git Commands for Rebasing and Squashing  

Rebasing and squashing commits can help keep your Git commit history clean and organized. Here’s how to use these powerful commands:

Interactive Rebase  

git rebase -i HEAD~n

Allows you to edit, reorder, and squash commits interactively.

Start Rebase  

git rebase main

Replays commits from the current branch onto the main branch.

Abort Rebase  

git rebase --abort

Cancels the rebase process and returns to the previous state.

Continue Rebase  

git rebase --continue

Continues the rebase process after resolving conflicts.

Skip a Commit  

git rebase --skip

Skips the current commit during a rebase.

Squashing Commits  

git rebase -i --autosquash HEAD~n

Combines multiple commits into one.

Fixup Commits  

git rebase -i --autosquash HEAD~n

Uses fixup to squash commits without changing commit messages.

Reword Commit Messages  

git rebase -i HEAD~n

Allows you to reword commit messages during an interactive rebase.

Force Push After Rebase  

git push --force-with-lease

Updates the remote repository with rebase changes, ensuring safety.

Rebase with Preserving Merges  

git rebase -p main

Preserves merge commits during a rebase.

Rebasing and squashing commits are essential techniques for maintaining a clean and organized commit history. Practice these commands to become proficient in managing your commit history effectively.