背景：
2012年从github上把tornado 做了一次fork.当时版本还是2.x
image.png
image.png
image.png
2017年的时候，发现版本已经更新到4.x 了
image.png
image.png
image.png
操作：
# NOTE: 从github上我的fork地址克隆一份下来，本地保存为 tornado_jiaxiaolei
$ git clone [email protected]:jiaxiaolei/tornado.git tornado_jiaxiaolei
$ pwd
$ /Users/jiaxiaolei/Documents/jia_git_project/jia__source/tornado_jiaxiaolei
$ git branch
* master
$ git branch -a
* master
remotes/origin/HEAD -> origin/master
remotes/origin/branch1.2
remotes/origin/branch2.0
remotes/origin/branch2.1
remotes/origin/master
$ ls
MANIFEST.in README demos maint setup.py tornado tox.ini website
$ git pull
Already up-to-date.
$ git remote add tornado [email protected]:tornadoweb/tornado.git
$ git pull tornado master
remote: Counting objects: 14386, done.
remote: Compressing objects: 100% (12/12), done.
remote: Total 14386 (delta 2998), reused 2999 (delta 2998), pack-reused 11376
Receiving objects: 100% (14386/14386), 5.22 MiB | 117.00 KiB/s, done.
Resolving deltas: 100% (10727/10727), completed with 216 local objects.
From github.com:tornadoweb/tornado
* branch master -> FETCH_HEAD
* [new branch] master -> tornado/master
Updating 0a949c0..d4094a0
Fast-forward
.coveragerc | 18 +
.gitignore | 17 +-
.travis.yml | 87 +++
LICENSE | 202 +++++++
MANIFEST.in | 21 +-
README | 32 --
README.rst | 48 ++
appveyor.yml | 76 +++
codecov.yml | 3 +
demos/appengine/app.yaml | 7 +-
demos/appengine/blog.py | 32 +-
demos/appengine/markdown.py | 1877 -------------------------------------------------------------
demos/appengine/static/blog.css | 4 +-
demos/appengine/templates/archive.html | 2 +-
demos/appengine/templates/base.html | 18 +-
demos/appengine/templates/compose.html | 10 +-
demos/appengine/templates/entry.html | 2 +-
...
$ ls
LICENSE MANIFEST.in README.rst appveyor.yml codecov.yml demos docs maint runtests.sh setup.py tornado tox.ini
$ git status
On branch master
Your branch is ahead of 'origin/master' by 2606 commits.
(use "git push" to publish your local commits)
nothing to commit, working directory clean
$ git push
warning: push.default is unset; its implicit value has changed in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the traditional behavior, use:
git config --global push.default matching
To squelch this message and adopt the new behavior now, use:
git config --global push.default simple
When push.default is set to 'matching', git will push local branches
to the remote branches that already exist with the same name.
Since Git 2.0, Git defaults to the more conservative 'simple'
behavior, which only pushes the current branch to the corresponding
remote branch that 'git pull' uses to update the current branch.
See 'git help config' and search for 'push.default' for further information.
(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
'current' instead of 'simple' if you sometimes use older versions of Git)
Counting objects: 14386, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (3832/3832), done.
Writing objects: 100% (14386/14386), 4.96 MiB | 334.00 KiB/s, done.
Total 14386 (delta 10741), reused 14141 (delta 10515)
remote: Resolving deltas: 100% (10741/10741), completed with 127 local objects.
To [email protected]:jiaxiaolei/tornado.git
0a949c0..d4094a0 master -> master
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
$ git branch -a
* master
remotes/origin/HEAD -> origin/master
remotes/origin/branch1.2
remotes/origin/branch2.0
remotes/origin/branch2.1
remotes/origin/master
remotes/tornado/master
通过上面的操作，tornado master 已经同步到 jiaxiaolei/tornado master 分支。
下面添加一个branch4.5 分支。
$ git pull tornado branch4.5
From github.com:tornadoweb/tornado
* branch branch4.5 -> FETCH_HEAD
* [new branch] branch4.5 -> tornado/branch4.5
Already up-to-date.
$ git push origin branch4.5
error: src refspec branch4.5 does not match any.
error: failed to push some refs to '[email protected]:jiaxiaolei/tornado.git'
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
$ git branch
* master
$ git branch -a
* master
remotes/origin/HEAD -> origin/master
remotes/origin/branch1.2
remotes/origin/branch2.0
remotes/origin/branch2.1
remotes/origin/master
remotes/tornado/branch4.5
remotes/tornado/master
$ git checkout remotes/tornado/branch4.5
Note: checking out 'remotes/tornado/branch4.5'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b
HEAD is now at 79b2683... Fix header for 4.5.1 release notes
$ git checkout -b branch4.5 remotes/tornado/branch4.5
Branch branch4.5 set up to track remote branch branch4.5 from tornado.
Switched to a new branch 'branch4.5'
$ git push origin branch4.5
Total 0 (delta 0), reused 0 (delta 0)
To [email protected]:jiaxiaolei/tornado.git
* [new branch] branch4.5 -> branch4.5
➜ tornado_jiaxiaolei git:(branch4.5) git branch -a
* branch4.5
master
remotes/origin/HEAD -> origin/master
remotes/origin/branch1.2
remotes/origin/branch2.0
remotes/origin/branch2.1
remotes/origin/branch4.5
remotes/origin/master
remotes/tornado/branch4.5
remotes/tornado/master
如法炮制：
同步 branch4.3分支和stable分支
$ git pull tornado branch4.3
From github.com:tornadoweb/tornado
* branch branch4.3 -> FETCH_HEAD
* [new branch] branch4.3 -> tornado/branch4.3
Already up-to-date.
$ git branch
* branch4.3
branch4.5
master
$ git push origin branch4.3
Total 0 (delta 0), reused 0 (delta 0)
To [email protected]:jiaxiaolei/tornado.git
* [new branch] branch4.3 -> branch4.3
$ git pull tornado stable
remote: Counting objects: 4, done.
remote: Total 4 (delta 2), reused 2 (delta 2), pack-reused 2
Unpacking objects: 100% (4/4), done.
From github.com:tornadoweb/tornado
* branch stable -> FETCH_HEAD
* [new branch] stable -> tornado/stable
Updating 26a5a6b..11ba169
Fast-forward
.gitignore | 1 +
.travis.yml | 78 +++++++++--------
$ git checkout -b stable tornado/stable
Branch stable set up to track remote branch stable from tornado.
Switched to a new branch 'stable'
$ git push origin stable
Counting objects: 6, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (6/6), 643 bytes | 0 bytes/s, done.
Total 6 (delta 5), reused 2 (delta 2)
remote: Resolving deltas: 100% (5/5), completed with 4 local objects.
To [email protected]:jiaxiaolei/tornado.git
* [new branch] stable -> stable
$ git branch -a
branch4.3
branch4.5
master
* stable
remotes/origin/HEAD -> origin/master
remotes/origin/branch1.2
remotes/origin/branch2.0
remotes/origin/branch2.1
remotes/origin/branch4.3
remotes/origin/branch4.5
remotes/origin/master
remotes/origin/stable
remotes/tornado/branch4.3
remotes/tornado/branch4.5
remotes/tornado/master
remotes/tornado/stable
同步tag
$ git pull tornado v4.5.1
remote: Counting objects: 1, done.
remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 1
Unpacking objects: 100% (1/1), done.
From github.com:tornadoweb/tornado
* tag v4.5.1 -> FETCH_HEAD
Already up-to-date.
$ git checkout -b v4.5.1 tornado/v4.5.1
fatal: Cannot update paths and switch to branch 'v4.5.1' at the same time.
Did you intend to checkout 'tornado/v4.5.1' which can not be resolved as commit?
$ ls
LICENSE MANIFEST.in README.rst appveyor.yml codecov.yml demos docs maint runtests.sh setup.py tornado tox.ini
$ git status
On branch stable
Your branch is up-to-date with 'tornado/stable'.
nothing to commit, working directory clean
$ git branch -a
branch4.3
branch4.5
master
* stable
remotes/origin/HEAD -> origin/master
remotes/origin/branch1.2
remotes/origin/branch2.0
remotes/origin/branch2.1
remotes/origin/branch4.3
remotes/origin/branch4.5
remotes/origin/master
remotes/origin/stable
remotes/tornado/branch4.3
remotes/tornado/branch4.5
remotes/tornado/master
remotes/tornado/stable
$ git tag
v1.0.0
v1.0.1
v1.1.0
v1.1.1
v1.2.0
v1.2.1
v2.0.0
v2.1.0
v2.1.1
$ git remote show origin
* remote origin
Fetch URL: [email protected]:jiaxiaolei/tornado.git
Push URL: [email protected]:jiaxiaolei/tornado.git
HEAD branch: master
Remote branches:
branch1.2 tracked
branch2.0 tracked
branch2.1 tracked
branch4.3 tracked
branch4.5 tracked
master tracked
stable tracked
Local branch configured for 'git pull':
master merges with remote master
Local refs configured for 'git push':
branch4.3 pushes to branch4.3 (fast-forwardable)
branch4.5 pushes to branch4.5 (up to date)
master pushes to master (up to date)
stable pushes to stable (up to date)
$ git remote update
Fetching origin
Fetching tornado
remote: Counting objects: 106, done.
remote: Total 106 (delta 42), reused 42 (delta 42), pack-reused 64
Receiving objects: 100% (106/106), 64.45 KiB | 86.00 KiB/s, done.
Resolving deltas: 100% (47/47), completed with 29 local objects.
From github.com:tornadoweb/tornado
* [new branch] branch1.2 -> tornado/branch1.2
* [new branch] branch2.0 -> tornado/branch2.0
* [new branch] branch2.1 -> tornado/branch2.1
* [new branch] branch2.2 -> tornado/branch2.2
* [new branch] branch2.3 -> tornado/branch2.3
* [new branch] branch2.4 -> tornado/branch2.4
* [new branch] branch3.0 -> tornado/branch3.0
* [new branch] branch3.1 -> tornado/branch3.1
* [new branch] branch3.2 -> tornado/branch3.2
* [new branch] branch4.0 -> tornado/branch4.0
* [new branch] branch4.1 -> tornado/branch4.1
* [new branch] branch4.2 -> tornado/branch4.2
* [new branch] branch4.4 -> tornado/branch4.4
* [new branch] gh-pages -> tornado/gh-pages
* [new tag] v2.2.0 -> v2.2.0
* [new tag] v2.2.1 -> v2.2.1
* [new tag] v2.3.0 -> v2.3.0
* [new tag] v2.4.0 -> v2.4.0
* [new tag] v2.4.1 -> v2.4.1
* [new tag] v3.0.0 -> v3.0.0
* [new tag] v3.0.1 -> v3.0.1
* [new tag] v3.0.2 -> v3.0.2
* [new tag] v3.1.0 -> v3.1.0
* [new tag] v3.1.1 -> v3.1.1
* [new tag] v3.2.0 -> v3.2.0
* [new tag] v3.2.0b1 -> v3.2.0b1
* [new tag] v3.2.0b2 -> v3.2.0b2
* [new tag] v3.2.1 -> v3.2.1
* [new tag] v3.2.2 -> v3.2.2
* [new tag] v4.0.0 -> v4.0.0
* [new tag] v4.0.0b1 -> v4.0.0b1
* [new tag] v4.0.0b2 -> v4.0.0b2
* [new tag] v4.0.0b3 -> v4.0.0b3
* [new tag] v4.0.1 -> v4.0.1
* [new tag] v4.0.2 -> v4.0.2
* [new tag] v4.1.0 -> v4.1.0
* [new tag] v4.1.0b1 -> v4.1.0b1
* [new tag] v4.1.0b2 -> v4.1.0b2
* [new tag] v4.2.0 -> v4.2.0
* [new tag] v4.2.0b1 -> v4.2.0b1
* [new tag] v4.2.1 -> v4.2.1
* [new tag] v4.3.0 -> v4.3.0
* [new tag] v4.3.0b1 -> v4.3.0b1
* [new tag] v4.3.0b2 -> v4.3.0b2
* [new tag] v4.4.0 -> v4.4.0
* [new tag] v4.4.0b1 -> v4.4.0b1
* [new tag] v4.4.1 -> v4.4.1
* [new tag] v4.4.2 -> v4.4.2
* [new tag] v4.4.3 -> v4.4.3
* [new tag] v4.5.0 -> v4.5.0
* [new tag] v4.5.1 -> v4.5.1
$ git fetch
# NOTE: 本地所有tag push 到origin
$ git push origin --tags
Counting objects: 26, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (26/26), done.
Writing objects: 100% (26/26), 46.08 KiB | 0 bytes/s, done.
Total 26 (delta 0), reused 26 (delta 0)
To [email protected]:jiaxiaolei/tornado.git
* [new tag] v2.2.0 -> v2.2.0
* [new tag] v2.2.1 -> v2.2.1
* [new tag] v2.3.0 -> v2.3.0
* [new tag] v2.4.0 -> v2.4.0
* [new tag] v2.4.1 -> v2.4.1
* [new tag] v3.0.0 -> v3.0.0
* [new tag] v3.0.1 -> v3.0.1
* [new tag] v3.0.2 -> v3.0.2
* [new tag] v3.1.0 -> v3.1.0
* [new tag] v3.1.1 -> v3.1.1
* [new tag] v3.2.0 -> v3.2.0
* [new tag] v3.2.0b1 -> v3.2.0b1
* [new tag] v3.2.0b2 -> v3.2.0b2
* [new tag] v3.2.1 -> v3.2.1
* [new tag] v3.2.2 -> v3.2.2
* [new tag] v4.0.0 -> v4.0.0
* [new tag] v4.0.0b1 -> v4.0.0b1
* [new tag] v4.0.0b2 -> v4.0.0b2
* [new tag] v4.0.0b3 -> v4.0.0b3
* [new tag] v4.0.1 -> v4.0.1
* [new tag] v4.0.2 -> v4.0.2
* [new tag] v4.1.0 -> v4.1.0
* [new tag] v4.1.0b1 -> v4.1.0b1
* [new tag] v4.1.0b2 -> v4.1.0b2
* [new tag] v4.2.0 -> v4.2.0
* [new tag] v4.2.0b1 -> v4.2.0b1
* [new tag] v4.2.1 -> v4.2.1
* [new tag] v4.3.0 -> v4.3.0
* [new tag] v4.3.0b1 -> v4.3.0b1
* [new tag] v4.3.0b2 -> v4.3.0b2
* [new tag] v4.4.0 -> v4.4.0
* [new tag] v4.4.0b1 -> v4.4.0b1
* [new tag] v4.4.1 -> v4.4.1
* [new tag] v4.4.2 -> v4.4.2
* [new tag] v4.4.3 -> v4.4.3
* [new tag] v4.5.0 -> v4.5.0
* [new tag] v4.5.1 -> v4.5.1
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
$ git remote show origin
* remote origin
Fetch URL: [email protected]:jiaxiaolei/tornado.git
Push URL: [email protected]:jiaxiaolei/tornado.git
HEAD branch: master
Remote branches:
branch1.2 tracked
branch2.0 tracked
branch2.1 tracked
branch4.3 tracked
branch4.5 tracked
master tracked
stable tracked
Local branch configured for 'git pull':
master merges with remote master
Local refs configured for 'git push':
branch4.3 pushes to branch4.3 (fast-forwardable)
branch4.5 pushes to branch4.5 (up to date)
master pushes to master (up to date)
stable pushes to stable (up to date)
$ git tag
v1.0.0
v1.0.1
v1.1.0
v1.1.1
v1.2.0
v1.2.1
v2.0.0
v2.1.0
v2.1.1
v2.2.0
v2.2.1
v2.3.0
v2.4.0
v2.4.1
v3.0.0
v3.0.1
v3.0.2
v3.1.0
v3.1.1
v3.2.0
v3.2.0b1
v3.2.0b2
v3.2.1
v3.2.2
v4.0.0
v4.0.0b1
v4.0.0b2
v4.0.0b3
v4.0.1
v4.0.2
v4.1.0
v4.1.0b1
v4.1.0b2
v4.2.0
v4.2.0b1
v4.2.1
v4.3.0
v4.3.0b1
v4.3.0b2
v4.4.0
v4.4.0b1
v4.4.1
v4.4.2
v4.4.3
v4.5.0
v4.5.1
扩展阅读
github上fork别人项目后如何与源项目保持同步
简介：
参考这个页面做了操作。