CmdID

CmdID / Commands

git-rebase

Reapply commits from one branch on top of another branch. tldr-pages

On several platforms

Opens CmdID with your command. It is read in your browser and sent nowhere.

Several platforms

from tldr-pages, CC BY 4.0

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.

Rebase the current branch on top of another specified branch

git rebase new_base_branchIdentify

Start an interactive rebase, which allows the commits to be reordered, omitted, combined, or modified

git rebase --interactive target_base_branch_or_commit_hashIdentify

Continue a rebase that was interrupted by a merge failure, after editing conflicting files

git rebase --continueIdentify

Continue a rebase that was paused due to merge conflicts, by skipping the conflicted commit

git rebase --skipIdentify

Abort a rebase in progress (e.g. if it is interrupted by a merge conflict)

git rebase --abortIdentify

Move part of the current branch onto a new base, providing the old base to start from

git rebase --onto new_base old_baseIdentify

Reapply the last 5 commits in-place, stopping to allow them to be reordered, omitted, combined, or modified

git rebase --interactive HEAD~5Identify

Auto-resolve any conflicts by favoring the working branch version (theirs keyword has reversed meaning in this case)

git rebase --strategy-option theirs branch_nameIdentify