github 本地项目连接

github 可以设置私有仓库啦！

需要本地服务器设置秘钥

$ ssh-keygen -t rsa -C "your email"

会在~/.ssh/ 生成两个文件

# 密钥文件
id_rsa 
# 公钥文件
id_rsa.pub 

把公钥内容，添加到github的ssh key 设置中

$ cat id_rsa.pub 

本地服务器测试是否可以连上github

$ ssh -T git@github.com
Hi xxx! You've successfully authenticated, but GitHub does not provide shell access.

提示：GitHub不提供shell（ssh）访问/接入权限。

解决：
本地项目中初始化git ,并设置远程仓库

# 初始化git 
$ git init 
$ git remote -v
$ git remote add origin git@github.com:xxx.git
$ git remote -v
origin  git@github.com:xxxx.git (fetch)
origin  git@github.com:xxx.git (push)

git pull origin master 报错

$ git pull origin 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 github.com:xxx
 * branch            master     -> FETCH_HEAD
 * [new branch]      master     -> origin/master
fatal: refusing to merge unrelated histories

操作命令后面加上 --allow-unrelated-histories 即可

$ git pull origin master --allow-unrelated-histories
From github.com:xxx
 * branch            master     -> FETCH_HEAD
Merge made by the 'recursive' strategy.
 README.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 README.md

类似命令
git merge master --allow-unrelated-histories
git push origin master --allow-unrelated-histories