1、添加远程仓库到本地remote分支
git remote add upstream [email protected]:apache/flink.git # 远程仓库地址
2、查看当前仓库的远程分支
git remote -v
origin [email protected]:springMoon/flink.git (fetch)
origin [email protected]:springMoon/flink.git (push)
upstream [email protected]:apache/flink.git (fetch) # 远程分支
upstream [email protected]:apache/flink.git (push)
3、fetch 远程分支
$ git fetch upstream
remote: Enumerating objects: , done.
remote: Counting objects: % (/), done.
remote: Compressing objects: % (/), done.
remote: Total (delta ), reused (delta ), pack-reused
Receiving objects: % (/), 26.84 KiB | 37.00 KiB/s, done.
Resolving deltas: % (/), completed with local objects.
From github.com:apache/flink
..abb35b6 master -> upstream/master
0130b86..481332e release-1.8 -> upstream/release-1.8
0d988d6..2d9c4e7 release-1.9 -> upstream/release-1.9
4、合并 fetch 的分支到本地master
$ git merge upstream/master
Updating ..abb35b6
Fast-forward
docs/dev/table/catalog.zh.md | ---------------------
docs/dev/table/hive/index.md | +-
docs/dev/table/hive/index.zh.md | +-
docs/dev/table/sqlClient.md | +-
docs/dev/table/sqlClient.zh.md | +-
.../test-scripts/kafka-common.sh | +-
.../test_high_parallelism_iterations.sh | +-
.../runtime/taskmanager/TaskAsyncCallTest.java | +-
.../functions/sql/FlinkSqlOperatorTable.java | +
.../planner/codegen/calls/StringCallGen.scala | +-
.../planner/expressions/ScalarFunctionsTest.scala | +-
.../planner/expressions/SqlExpressionTest.scala | +
files changed, insertions(+), deletions(-)
delete mode docs/dev/table/catalog.zh.md
5、查看log最近更新日志
$ git log
commit abb35b6f9bead00fe294c9f0c01aae1676e3d34c
Author: bowen.li <[email protected]>
Date: Wed Aug :: - [hotfix][doc] remove obsolete catalog.md in favor of new catalogs.md commit e5dd9bcd71201d50d68c6932d438e6e196ea466e
Author: Seth Wiesman <[email protected]>
Date: Tue Aug :: - [docs] Broken links in Hive documentation This closes #. commit 7b4c23255b900ced0afe060194bbb737981405e2
Author: zjuwangg <[email protected]>
Date: Wed Aug :: +
6、推送本地master 到远程仓库（自己fork的仓库）
git push origin master