Merging an upstream repository into your fork

           1. Check out the branch you wish to merge to. Usually, you will merge into master.

1. $ git checkout master

    2. Pull the desired branch from the upstream repository. This method will retain the commit history without modification.

2. $ git pull https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git BRANCH_NAME

转自： https://help.github.com/articles/merging-an-upstream-repository-into-your-fork/

Merging an upstream repository into your fork

原文：http://www.cnblogs.com/pinganzi/p/6291129.html