github fork 之后与源项目保持同步

背景：

2012年从github上把tornado 做了一次fork.当时版本还是2.x

image.png

2017年的时候，发现版本已经更新到4.x 了

image.png

操作：

# NOTE:  从github上我的fork地址克隆一份下来，本地保存为 tornado_jiaxiaolei
$ git clone git@github.com: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 git@github.com: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 git@github.com: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 'git@github.com: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 <new-branch-name>

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 git@github.com: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 git@github.com: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 git@github.com: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: git@github.com:jiaxiaolei/tornado.git
  Push  URL: git@github.com: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 git@github.com: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: git@github.com:jiaxiaolei/tornado.git
  Push  URL: git@github.com: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别人项目后如何与源项目保持同步
简介：
参考这个页面做了操作。

最后编辑于：2017.12.09 20:44:45

人面猴
序言：七十年代末，一起剥皮案震惊了整个滨河市，随后出现的几起案子，更是在滨河造成了极大的恐慌，老刑警刘岩，带你破解...
沈念sama阅读 204,445评论 6赞 478
死咒
序言：滨河连续发生了三起死亡事件，死亡现场离奇诡异，居然都是意外死亡，警方通过查阅死者的电脑和手机，发现死者居然都...
沈念sama阅读 85,889评论 2赞 381
救了他两次的神仙让他今天三更去死
文/潘晓璐我一进店门，熙熙楼的掌柜王于贵愁眉苦脸地迎上来，“玉大人，你说我怎么就摊上这事。” “怎么了？”我有些...
开封第一讲书人阅读 151,047评论 0赞 337
道士缉凶录：失踪的卖姜人
文/不坏的土叔我叫张陵，是天一观的道长。经常有香客问我，道长，这世上最难降的妖魔是什么？我笑而不...
开封第一讲书人阅读 54,760评论 1赞 276
港岛之恋（遗憾婚礼）
正文为了忘掉前任，我火速办了婚礼，结果婚礼上，老公的妹妹穿的比我还像新娘。我一直安慰自己，他们只是感情好，可当我...
茶点故事阅读 63,745评论 5赞 367
恶毒庶女顶嫁案：这布局不是一般人想出来的
文/花漫我一把揭开白布。她就那样静静地躺着，像睡着了一般。火红的嫁衣衬着肌肤如雪。梳的纹丝不乱的头发上，一...
开封第一讲书人阅读 48,638评论 1赞 281
城市分裂传说
那天，我揣着相机与录音，去河边找鬼。笑死，一个胖子当着我的面吹牛，可吹牛的内容都是我干的。我是一名探鬼主播，决...
沈念sama阅读 38,011评论 3赞 398
双鸳鸯连环套：你想象不到人心有多黑
文/苍兰香墨我猛地睁开眼，长吁一口气：“原来是场噩梦啊……” “哼！你这毒妇竟也来了？” 一声冷哼从身侧响起，我...
开封第一讲书人阅读 36,669评论 0赞 258
万荣杀人案实录
序言：老挝万荣一对情侣失踪，失踪者是张志新（化名）和其女友刘颖，没想到半个月后，有当地人在树林里发现了一具尸体，经...
沈念sama阅读 40,923评论 1赞 299
护林员之死
正文独居荒郊野岭守林人离奇死亡，尸身上长有42处带血的脓包…… 初始之章·张勋以下内容为张勋视角年9月15日...
茶点故事阅读 35,655评论 2赞 321
白月光启示录
正文我和宋清朗相恋三年，在试婚纱的时候发现自己被绿了。大学时的朋友给我发了我未婚夫和他白月光在一起吃饭的照片。...
茶点故事阅读 37,740评论 1赞 330
活死人
序言：一个原本活蹦乱跳的男人离奇死亡，死状恐怖，灵堂内的尸体忽然破棺而出，到底是诈尸还是另有隐情，我是刑警宁泽，带...
沈念sama阅读 33,406评论 4赞 320
日本核电站爆炸内幕
正文年R本政府宣布，位于F岛的核电站，受9级特大地震影响，放射性物质发生泄漏。R本人自食恶果不足惜，却给世界环境...
茶点故事阅读 38,995评论 3赞 307
男人毒药：我在死后第九天来索命
文/蒙蒙一、第九天我趴在偏房一处隐蔽的房顶上张望。院中可真热闹，春花似锦、人声如沸。这庄子的主人今日做“春日...
开封第一讲书人阅读 29,961评论 0赞 19
一桩弑父案，背后竟有这般阴谋
文/苍兰香墨我抬头看了看天上的太阳。三九已至，却和暖如春，着一层夹袄步出监牢的瞬间，已是汗流浃背。一阵脚步声响...
开封第一讲书人阅读 31,197评论 1赞 260
情欲美人皮
我被黑心中介骗来泰国打工，没想到刚下飞机就差点儿被人妖公主榨干…… 1. 我叫王不留，地道东北人。一个月前我还...
沈念sama阅读 45,023评论 2赞 350
代替公主和亲
正文我出身青楼，却偏偏与公主长得像，于是被迫代替她去往敌国和亲。传闻我的和亲对象是个残疾皇子，可洞房花烛夜当晚...
茶点故事阅读 42,483评论 2赞 342

github fork 之后与源项目保持同步

扩展阅读

推荐阅读更多精彩内容