Created
February 18, 2016 20:24
-
-
Save wbtuomela/cb962455e90742010232 to your computer and use it in GitHub Desktop.
Merge upstream into forked tree
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
For example, current branch name is "proto" and remote repository name is "upstream". | |
This command performs the following processings in order. | |
git stash | |
git checkout master | |
git pull upstream master | |
git checkout proto | |
git rebase master proto | |
git stash pop |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment