Created
February 26, 2011 15:08
-
-
Save paulchubatyy/845278 to your computer and use it in GitHub Desktop.
Create a new branch and merge upstream/3.1 there
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
| git remote add upstream https://github.com/mattrude/wordpress.git | |
| git fetch upstream | |
| git checkout -b integration | |
| git merge --no-ff upstream/3.1 |
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
| git checkout master | |
| git rebase integration |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment