Merge upstream into forked tree

git_catch_up

 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