2015-12-29 22:54:20 +00:00
|
|
|
# git rebase
|
|
|
|
|
|
|
|
|
|
> Apply local commits on top of another branch's history
|
|
|
|
|
|
2015-12-30 17:36:58 +00:00
|
|
|
- Rebase your local branch interactively with the latest changes in local master
|
2015-12-29 22:54:20 +00:00
|
|
|
|
2015-12-30 17:36:58 +00:00
|
|
|
`git rebase -i master`
|
|
|
|
|
|
|
|
|
|
- Rebase your local branch interactively with the latest changes from upstream
|
|
|
|
|
|
|
|
|
|
`git fetch origin; git rebase -i origin/master`
|
|
|
|
|
|
|
|
|
|
- Handling an active rebase merge failure, after editing conflicting file(s)
|
|
|
|
|
|
|
|
|
|
`git rebase --continue`
|
|
|
|
|
|
|
|
|
|
- Abort a rebase in-progress
|
|
|
|
|
|
|
|
|
|
`git rebase --abort`
|
