reconstruct the content

jiangxincode · jiangxincode · commit 0af3bb7996d6 · 2018-07-08T11:50:43.000+08:00
diff --git a/版本管理学习之路.md b/版本管理学习之路.md
@@ -6,10 +6,8 @@
 * <http://www.gitlab.cc/> (Git)
 * <https://bitbucket.org/> (Git Mercurial)
 * <https://sourceforge.net/> (Git Mercurial SVN)
-* <http://www.codeplex.com/>
 * <https://sourceware.org/>
-* <http://git.oschina.net/>
-* <http://www.javaforge.com> (Git Mercurial SVN)
+* <https://gitee.com/>
 * <http://unfuddle.com>
 * <https://riouxsvn.com/> (SVN)
 * <http://svn.jundie.net/>
@@ -19,10 +17,12 @@
 ## 代码托管网站（已废弃）
 
 * <http://code.taobao.org/> (SVN)
-* <http://code.google.com/>
+* <http://code.google.com/> (SVN)
 * <http://svn.coollittlethings.com/index.php>
 * <http://www.svnhost.cn/> (SVN)
 * <http://www.chinasvn.com> (SVN)
+* <http://www.codeplex.com/>
+* <http://www.javaforge.com> (Git Mercurial SVN)
 
 ## SVN
 
@@ -73,47 +73,53 @@
 * Documentation：<http://git-scm.com/doc>
 * Pro Git book: <https://git-scm.com/book/en>
 
+### Git客户端
+
 * git for windows：<http://gitforwindows.org/>
 * posh-git: <https://github.com/dahlbyk/posh-git>
 * SourceTree：<https://www.sourcetreeapp.com/>
 * tortoisegit：<https://code.google.com/p/tortoisegit/>
 * gitlab：<https://about.gitlab.com/>
 * EGit：<http://www.eclipse.org/egit/download/>
 
-* <http://githuber.info/index>
+### Github插件
 
 * Travis CI: <https://travis-ci.org/>
 * appveyor: <https://ci.appveyor.com/>
 * codeclimate: <https://codeclimate.com/>
 * GITTER: <https://gitter.im/home>
 * Waffle: <https://waffle.io/>
-* bitdeli: <https://bitdeli.com/>
 * COVERALLS: <https://coveralls.io/>
 * COVERITY: <https://scan.coverity.com/>
-* choosealicense: <http://choosealicense.com/>
+* choosealicense: <https://choosealicense.com/>
+
+### Git优秀文章
 
 * Git Community Book 中文版：<http://gitbook.liuhui998.com/index.html>
+* git/github初级运用自如：<http://www.cnblogs.com/fnng/archive/2012/01/07/2315685.html>
+* github使用指南：<https://github.com/NeuOL/neuola-legacy/wiki/github>使用指南
+* windows中使用Git工具连接GitHub(配置篇)：<http://www.cnblogs.com/sorex/archive/2011/08/10/2132359.html>
+* 打造完美 Windows git 命令行环境：<http://www.v2ex.com/t/154202>
+* 详解在visual studio中使用git版本系统(图文)：<http://www.cnblogs.com/wojilu/archive/2011/11/16/2250721.html>
+
+* Commit message 和 Change log 编写指南：<http://www.ruanyifeng.com/blog/2016/01/commit_message_change_log.html>
+* Writing a Friendly README: <http://rowanmanning.com/posts/writing-a-friendly-readme/>
+* 上传图片到github wiki仓库: <https://www.jianshu.com/p/bd5c1b33d2c5>
+* Publishing a Website on Bitbucket Cloud: <https://confluence.atlassian.com/bitbucket/publishing-a-website-on-bitbucket-cloud-221449776.html>
+* GitHub Pages + Hexo搭建博客: <http://crazymilk.github.io/2015/12/28/GitHub-Pages-Hexo%E6%90%AD%E5%BB%BA%E5%8D%9A%E5%AE%A2/>
+* Hexo+Next搭建Github个人静态博客: <http://www.cnblogs.com/cnfanhua/p/5167191.html>
+
 * 分支管理策略: <https://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000/0013758410364457b9e3d821f4244beb0fd69c61a185ae0000>
 * Bug分支: <https://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000/00137602359178794d966923e5c4134bc8bf98dfb03aea3000>
 * git patch: Version Control with Git 2nd Edition[Git 版本控制管理 第2版] CHAPTER 14 Patches
 * Permanently remove files and folders from Git repo：<http://dalibornasevic.com/posts/2-permanently-remove-files-and-folders-from-a-git-repository>
-* git/github初级运用自如：<http://www.cnblogs.com/fnng/archive/2012/01/07/2315685.html>
-* windows中使用Git工具连接GitHub(配置篇)：<http://www.cnblogs.com/sorex/archive/2011/08/10/2132359.html>
-* 详解在visual studio中使用git版本系统(图文)：<http://www.cnblogs.com/wojilu/archive/2011/11/16/2250721.html>
 * git 把文件从版本管理中移除：<http://blog.sina.com.cn/s/blog_59fb90df0101980a.html>
 * git乱码解决方案汇总：<http://zengrong.net/post/1249.htm>
 * git pull 和本地文件冲突问题解决：<http://my.oschina.net/u/554046/blog/308614>
-* 打造完美 Windows git 命令行环境：<http://www.v2ex.com/t/154202>
 * Remove sensitive data：<https://help.github.com/articles/remove-sensitive-data/>
 * Caching your GitHub password in Git：<https://help.github.com/articles/caching-your-github-password-in-git/>
-* github使用指南：<https://github.com/NeuOL/neuola-legacy/wiki/github>使用指南
 * github创建tag: <http://caibaojian.com/github-create-tag.html>
-* Commit message 和 Change log 编写指南：<http://www.ruanyifeng.com/blog/2016/01/commit_message_change_log.html>
-* Writing a Friendly README: <http://rowanmanning.com/posts/writing-a-friendly-readme/>
-* GitHub Pages + Hexo搭建博客: <http://crazymilk.github.io/2015/12/28/GitHub-Pages-Hexo%E6%90%AD%E5%BB%BA%E5%8D%9A%E5%AE%A2/>
-* Hexo+Next搭建Github个人静态博客: <http://www.cnblogs.com/cnfanhua/p/5167191.html>
 * Git教程-分支和tag管理: <http://blog.csdn.net/top_code/article/details/52336221>
-* Publishing a Website on Bitbucket Cloud: <https://confluence.atlassian.com/bitbucket/publishing-a-website-on-bitbucket-cloud-221449776.html>
 * What are the git concepts of HEAD, master, origin? <https://stackoverflow.com/questions/8196544/what-are-the-git-concepts-of-head-master-origin>
 * How do I make Git use the editor of my choice for commits?: <https://stackoverflow.com/questions/2596805/how-do-i-make-git-use-the-editor-of-my-choice-for-commits>
 * warning: push.default is unset的解决方案: <http://blog.csdn.net/jrainbow/article/details/19338525>
@@ -122,9 +128,8 @@
 * git中将多次commit合并为一次commit: <http://blog.csdn.net/itfootball/article/details/44037181>
 * Resolving a merge conflict on gerrit: <https://www.entropywins.wtf/blog/2013/07/01/resolving-a-merge-conflict-on-gerrit/>
 * CHERRY-PICKING SPECIFIC COMMITS FROM ANOTHER BRANCH: <https://www.devroom.io/2010/06/10/cherry-picking-specific-commits-from-another-branch/>
-* 上传图片到github wiki仓库: <https://www.jianshu.com/p/bd5c1b33d2c5>
 * git checkout --ours/--theirs: <https://git-scm.com/docs/git-checkout>
-* Git 如何 Merge 其他Fork仓库的代码到自己的仓库: <https://my.oschina.net/sub/blog/178652>
+* github上fork了别人的项目后，再同步更新别人的提交: <https://blog.csdn.net/qq1332479771/article/details/56087333>
 
 ### git init 与 git init --bare
 
