Git使用心得

关键信息：

# ssh免密登录
ssh user@ip
ssh-keygen -t rsa
将公钥复制到 user家目录下 ~/.ssh/authorized_keys (没有创建)

git pull user@ip:/项目路径

遇到的问题：

1，

warning: LF will be replaced by CRLF in ......    
The file will have its original line endings in your working directory.

解决办法：
git config --gobal core.autocrlf false

参考：http://michael-roshen.iteye.com/blog/1328142

2，

refusing to merge unrelated histories

解决办法：
git pull origin master ----allow-unrelated-histories

参考：http://blog.csdn.net/lindexi_gd/article/details/52554159

3，

remote: error: refusing to update checked out branch: refs/heads/master
remote: error: By default, updating the current branch in a non-bare repository
remote: error: is denied, because it will make the index and work tree inconsistent
remote: error: with what you pushed, and will require 'git reset --hard' to match
remote: error: the work tree to HEAD.
remote: error:
remote: error: You can set 'receive.denyCurrentBranch' configuration variable to
remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into
remote: error: its current branch; however, this is not recommended unless you
remote: error: arranged to update its work tree to match what you pushed in some
remote: error: other way.
remote: error:
remote: error: To squelch this message and still keep the default behaviour, set
remote: error: 'receive.denyCurrentBranch' configuration variable to '
refuse'

因为git默认拒绝接收push
解决办法：vim .git/config
 [receive]
    denyCurrentBranch = ignore

参考：http://blog.csdn.net/xinguimeng/article/details/45460491