2018-01-18T15:16:08Z||2018-01-18T15:16:08Z


将原始repo加入到remote list中:

git remote add upstream https://github.com/abc/def

可以通过git remote -v来检查远程的列表。通常是originupstream.

最后通过git merge来把remote upstreammaster合并到本地master.

git merge upstream/master