git基础使用（一）

创建文件夹

$git init

建立仓库

$ git config --global user.name "Your Name"
$ git config --global user.email "email@example.com"

配置姓名，邮箱

ssh-keygen -t rsa -C "xxxxx@xxxxx.com"

创建公共钥匙，保存文件名、密码都默认   三个选项都回车

把秘钥添加到网站上

ssh -T git@git.oschina.net

返回

Welcome to Git@OSC, yourname! 

则成功

$ git remote add origin git@github.com:michaelliao/learngit.git
$ git push -u origin master

添加远程连接，并推送

$ git push -u origin master

To git@github.com:yangchao0718/cocos2d.git

 ! [rejected]        master -> master (non-fast-forward)

error: failed to push some refs to 'git@github.com:yangchao0718/cocos2d.git

hint: Updates were rejected because the tip of your current branch is behin

hint: its remote counterpart. Integrate the remote changes (e.g.

hint: 'git pull ...') before pushing again.

hint: See the 'Note about fast-forwards' in 'git push --help' for details.

可能会出现上述错误

那是因为远程仓库中有本地仓库所没有的文件

$ git pull --rebase origin master

先合并远程仓库和本地仓库

在推送