Created
April 24, 2012 18:14
-
-
Save drewdeponte/2482238 to your computer and use it in GitHub Desktop.
ranged rebase
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Here is how you would transplant a topic branch based on one branch to another, to pretend that you forked the topic branch from | |
the latter branch, using rebase --onto. | |
First let's assume your topic is based on branch next. For example, a feature developed in topic depends on some functionality | |
which is found in next. | |
o---o---o---o---o master | |
\ | |
o---o---o---o---o next | |
\ | |
o---o---o topic | |
We want to make topic forked from branch master; for example, because the functionality on which topic depends was merged into | |
the more stable master branch. We want our tree to look like this: | |
o---o---o---o---o master | |
| \ | |
| o'--o'--o' topic | |
\ | |
o---o---o---o---o next | |
We can get this using the following command: | |
git rebase --onto master next topic |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment