详细教程

http://git-scm.com/book/zh/v1/

http://gitbook.liuhui998.com/index.html

http://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000

简明教程

http://rogerdudler.github.io/git-guide/index.zh.html

解决同一分支远程和本地冲突

http://www.01happy.com/git-resolve-conflicts/


coding.net

https://coding.net/u/coding/p/Coding-Feedback/git/blob/master/git-starter-tutorial.md




分支管理 


http://blog.jobbole.com/76857/

http://blog.jobbole.com/23398/

http://blog.csdn.net/wh_19910525/article/details/7488931


其他

http://www.01happy.com/git-manage-multi-task-project/

http://www.yiibai.com/git/git_perform_changes.html