Git使用心得

遇到的问题：

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/masterremote: error: By default, updating the current branch in a non-bare repositoryremote: error: is denied, because it will make the index and work tree inconsistentremote: error: with what you pushed, and will require 'git reset --hard' to matchremote: error: the work tree to HEAD.remote: error:remote: error: You can set 'receive.denyCurrentBranch' configuration variable toremote: error: 'ignore' or 'warn' in the remote repository to allow pushing intoremote: error: its current branch; however, this is not recommended unless youremote: error: arranged to update its work tree to match what you pushed in someremote: error: other way.remote: error:remote: error: To squelch this message and still keep the default behaviour, setremote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'因为git默认拒绝接收push解决办法：vim .git/config [receive]    denyCurrentBranch = ignore

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