Cheatsheet Pages / Git Cheatsheet

How to finish or cancel a Git rebase — --continue / --abort

A rebase stopped on a conflict and you need to push through it — or bail out completely.

git rebase --continue   # after resolving conflicts and staging them
git rebase --abort      # cancel everything, back to pre-rebase state

Good to know

Resolve conflicts, stage them, then continue — or abort to return to where you started.

Git Cheatsheet one-page card — 30 daily and rescue commands
The full one-page card — Git Cheatsheet. Get the complete cheatsheet on GitHub