git rebase

Reapply commits from one branch on top of another branch. Commonly used to "move" an entire branch to another base, creating copies of the commits in the new location. More information: https://git-scm.com/docs/git-rebase.

git rebase new_base_branch

git rebase -i target_base_branch_or_commit_hash

git rebase --continue

git rebase --skip

git rebase --abort

git rebase --onto new_base old_base

git rebase -i HEAD~5

git rebase -X theirs branch_name