草稿

关联分支
$ git remote add master git@git-internal.nie.netease.com:32200/zhanghui03/windsoul.git
查看权限
$ git remote -v
master git@git-internal.nie.netease.com:32200/zhanghui03/windsoul.git (fetch)
master git@git-internal.nie.netease.com:32200/zhanghui03/windsoul.git (push)
查看远程分支名称
$ git remote
master
遇到错误啦:
$ git pull
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.

git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

git branch --set-upstream-to=master/<branch> master

换一种方式pull
$ git pull master master
ssh: connect to host git-internal.nie.netease.com port 22: Connection refused
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

$ git pull ssh: connect to host git-internal.nie.netease.com port 22: Connection refused

查看本地分支
$ git branch

• master

删除本地关联分支
$ git remote rm master

重新用http协议关联
$ git remote add master http://git-internal.nie.netease.com/zhanghui03/windsoul.git

查看
$ git remote -v
master http://git-internal.nie.netease.com/zhanghui03/windsoul.git (fetch)
master http://git-internal.nie.netease.com/zhanghui03/windsoul.git (push)

重新拉取
zhanghui03@GIH-D-16151 MINGW64 ~/Desktop/wsxp_vs/wsxp (master)
$ git pull master master
warning: no common commits
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), done.
From http://git-internal.nie.netease.com/zhanghui03/windsoul

• branch master -> FETCH_HEAD
• [new branch] master -> master/master
  fatal: refusing to merge unrelated histories

强行合并两个分支
$ git pull master master --allow-unrelated-histories

再拉取一次, 成功了
$ git pull master master --allow-unrelated-histories
From http://git-internal.nie.netease.com/zhanghui03/windsoul

• branch master -> FETCH_HEAD
  Merge made by the 'recursive' strategy.
  README.md | 3 +++
  1 file changed, 3 insertions(+)
  create mode 100644 README.md

查看log
$ git log
commit 46d422b63590580d416bd1dfde4f501e407b39ff (HEAD -> master)
Merge: d0b8009 010f43e
Author: 张辉 zhanghui03@corp.netease.com
Date: Wed May 13 08:18:36 2020 +0800

Merge branch 'master' of http://git-internal.nie.netease.com/zhanghui03/windsoul

commit 010f43eee2eb66acd7811edb11261b5f775b2e21 (master/master)
Author: 张辉 zhanghui03@corp.netease.com
Date: Wed May 13 07:55:20 2020 +0800

Initial commit

commit d0b8009206931a42bc3b393a3e39e70965048f3e
Author: 张辉 zhanghui03@corp.netease.com
Date: Wed May 13 07:50:43 2020 +0800

【最小 保证 windsoul可运行的版本】

commit e2ab2f5bcdbaffc2b574a3c6140eb63f1bc569f2
Author: sixgod_zhang 739536111@qq.com
Date: Tue Jan 7 14:37:28 2020 +0800

【wsxp 正常显示文字】

commit 75a091bdec39cd4a5681363505d71fc57c5db9e9
Author: sixgod_zhang 739536111@qq.com
Date: Wed Dec 18 15:43:45 2019 +0800

Init

commit 0b38f20e1a09ffd9ecc1767f3a2f9fb1eaf5931c
Author: sixgod_zhang 739536111@qq.com
Date: Wed Dec 18 15:42:31 2019 +0800

【风魂GUI】

推送分支
$ git push master master
Enumerating objects: 298, done.
Counting objects: 100% (298/298), done.
Delta compression using up to 6 threads
Compressing objects: 100% (292/292), done.
Writing objects: 100% (297/297), 46.81 MiB | 6.61 MiB/s, done.
Total 297 (delta 42), reused 0 (delta 0)
remote: Resolving deltas: 100% (42/42), done.
To http://git-internal.nie.netease.com/zhanghui03/windsoul.git
010f43e..46d422b master -> master