bashANYgitrebaseinteractive
bash
git rebase -i HEAD~3Opens the todo list so you can reorder, squash, edit, or drop commits.
Git Rebase Cheat Sheet
Advanced rebase commands, interactive workflows, conflict handling, and branch-transplant patterns.
Export
Copy the compact sheet, download it, or print it.
Download
`D` dense toggle · `C` copy all
Interactive Rebase Basics
Open, edit, and manage interactive rebase sessions.
bashANYgitrebaseinteractivetodo
bash
git rebase --edit-todoHelpful when you need to change the sequence or actions after the rebase has already started.
bashANYgitrebaseconflictpatch
bash
git rebase --show-current-patchUseful when a rebase stops on a conflict and you want to see the exact patch Git is trying to apply.
bashANYgitrebasecontinueconflicts
bash
git rebase --continueStandard next step after resolving conflicts and staging the intended resolutions.
bashANYgitrebaseabort
bash
git rebase --abortUse this when the rebase becomes too messy or you want to restart with a different strategy.
bashANYgitrebaseskip
bash
git rebase --skipOnly use when you intentionally want to drop the stopped patch from the rebased history.
Interactive Rebase Actions
Common todo-list actions used in interactive rebase.
textANYgitrebasetodopick
text
pick a1b2c3d Commit message`pick` is the default action and applies the commit as a normal rebased commit.
textANYgitrebasetodoreword
text
reword a1b2c3d Commit messageUse `reword` when the commit content is correct but the message needs cleanup.
textANYgitrebasetodoedit
text
edit a1b2c3d Commit messageUse `edit` when you need to change the commit content, split the commit, or otherwise manipulate it mid-rebase.
textANYgitrebasetodosquash
text
squash d4e5f6g Follow-up fix`squash` merges the commit into the previous one and opens an editor to combine messages.
textANYgitrebasetodofixup
text
fixup d4e5f6g Follow-up fixIdeal when the follow-up commit should disappear into the previous commit without preserving its message.
textANYgitrebasetododrop
text
drop badc0de Temporary experimentUse `drop` carefully because it removes the commit from the resulting branch history.
Common Rebase Workflows
Typical advanced rebasing patterns.
bashANYgitrebasemainworkflow
bash
git rebase mainKeeps feature history linear by replaying it on top of another branch tip.
bashANYgitpullrebaseworkflow
bash
git pull --rebaseOften preferred for keeping local history clean when syncing with a tracking branch.
bashANYgitrebaseontoworkflow
bash
git rebase --onto new-base old-base topicClassic advanced rebase pattern for moving a subset of commits that originally started after `old-base`.
bashANYgitrebaseroothistory
bash
git rebase -i --rootUseful for cleaning very early history or splitting an initial commit in private repositories.
bashANYgitrebaseautostashworkflow
bash
git rebase --autostash mainHelpful when your working tree is not clean but you still need to rebase.
bashANYgitrebasemergeworkflow
bash
git rebase --rebase-merges mainA more advanced option when branch history contains meaningful merges that should not be flattened.
Rebase Conflicts and Recovery
Diagnose and recover from difficult rebase situations.
bashANYgitrebasestatusconflicts
bash
git statusGit status gives the clearest view of what remains to be resolved during a paused rebase.
bashANYgitrebasererereconflicts
bash
git config --global rerere.enabled trueA strong quality-of-life improvement for repeated rebases or long-lived branches.
bashANYgitrebaseconflictours
bash
git checkout --ours path/to/file && git add path/to/fileUseful in conflict resolution when you intentionally want your branch version of a path.
bashANYgitrebaseconflicttheirs
bash
git checkout --theirs path/to/file && git add path/to/fileUseful in conflict resolution when the rebased-on branch version should win for a path.
bashANYgitrebasereflogrecovery
bash
git reflog | head -20Reflog is usually the fastest recovery path when a rebase result is not what you wanted.
More in Git Advanced
Git Bisect, Cherry-pick, and Submodule Cheat Sheet
Advanced workflows for regression hunting, selective commit transfer, and repository dependency management.
Git Stash, Worktree, and Clean Cheat Sheet
Temporary work preservation, multi-worktree workflows, cleanup commands, and conflict-resolution reuse.
Git Reset, Revert, and Restore Cheat Sheet
Understand the differences between reset, revert, and restore and use the right recovery command safely.
Git Reflog and Recovery Cheat Sheet
Recover commits, branches, and work after resets, rebases, deletes, and mistaken force updates.
Git Advanced Cheat Sheet
Advanced Git commands and workflows for rewriting history, recovering commits, debugging regressions, working with multiple trees, and maintaining repositories.