1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2024-11-02 01:18:00 +01:00
tldr/pages/common/git-rebase.md

20 lines
465 B
Markdown
Raw Normal View History

# git rebase
2016-01-21 13:08:45 +01:00
> Apply local commits on top of another branch's history.
2016-01-21 13:08:45 +01:00
- Rebase your local branch interactively with the latest changes in local master:
2015-12-30 18:36:58 +01:00
`git rebase -i master`
2016-01-21 13:08:45 +01:00
- Rebase your local branch interactively with the latest changes from upstream:
2015-12-30 18:36:58 +01:00
`git fetch origin; git rebase -i origin/master`
2016-01-21 13:08:45 +01:00
- Handle an active rebase merge failure, after editing conflicting file(s):
2015-12-30 18:36:58 +01:00
`git rebase --continue`
2016-01-21 13:08:45 +01:00
- Abort a rebase in-progress:
2015-12-30 18:36:58 +01:00
`git rebase --abort`