Git Cheat Sheet/Continue rebase

Resume after resolving conflicts.

Section: Merge, Rebase, and Commit Selection

Continue rebase

bash
bash
git rebase --continue

Learn the surrounding workflow

Compare similar commands or jump into common fixes when this command is part of a bigger troubleshooting path.

Related commands

Same sheet · prioritizing Merge, Rebase, and Commit Selection
Set pull to rebase by default
Avoid merge commits on pull.
OpenIn sheetbash1 tag match
Pull with rebase
Fetch and replay local commits on top of upstream.
OpenIn sheetbash1 tag match
Create fixup commit
Prepare a fixup for autosquash rebase.
OpenIn sheetbash1 tag match
Set global user name
Set default author name.
Initialize repository
Create a new repository in the current directory.
Status short format
Compact status listing.