mirror of https://github.com/CrimsonTome/tldr.git
29 lines
911 B
Markdown
29 lines
911 B
Markdown
# 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.
|
|
|
|
- Rebase the current branch on top of the master branch:
|
|
|
|
`git rebase {{master}}`
|
|
|
|
- Start an interactive rebase, which allows the commits to be reordered, omitted, combined or modified:
|
|
|
|
`git rebase -i {{target_base_branch}}`
|
|
|
|
- Continue a rebase that was interrupted by a merge failure, after editing conflicting files:
|
|
|
|
`git rebase --continue`
|
|
|
|
- Abort a rebase in progress (e.g. if it is interrupted by a merge conflict):
|
|
|
|
`git rebase --abort`
|
|
|
|
- Move part of the current branch onto a new base, providing the old base to start from:
|
|
|
|
`git rebase --onto {{new_base}} {{old_base}}`
|
|
|
|
- Reapply the last 5 commits in-place, stopping to allow them to be reordered, omitted, combined or modified:
|
|
|
|
`git rebase -i {{HEAD~5}}`
|