Continue a rebase after fixing conflicts

Resumes the rebase once the conflicting files are fixed and staged with git add.

git rebase --continue
Tool
git
Category
Git & CI
Tags

Report an issue wrong command, wrong danger level, typo… (on GitHub)

Adapted from tldr-pages (common/git-rebase.md), licensed under CC BY 4.0.

Copy a destructive command?

This command can permanently delete data. Check every value before running it.

Keyboard shortcuts

/ or Ctrl K or ⌘ K
Focus the search
↓ or ↑
Move through the results
Enter
Copy the selected command
Tab
Edit the values of the selected command
o
Open the selected command page
f
Add or remove the selected command from favorites
Esc
Clear the search, or leave the list
?
Show this help

Values you edit carry over to the same value of the other commands, except on destructive commands, where they are always typed by hand.