diff --git a/LICENSE.md b/LICENSE.md index 7ec9319..e2e570f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -4,7 +4,7 @@ The prose, course text, slide layouts, class outlines, diagrams, HTML, CSS, and ------------------------ # Attribution 3.0 Unported (CC BY 3.0) -This is a [human-readable summary](http://creativecommons.org/licenses/by/3.0/deed.en_US) of the [Legal Code (the full license)](http://creativecommons.org/licenses/by/3.0/legalcode). +This is a [human-readable summary](https://creativecommons.org/licenses/by/3.0/deed.en_US) of the [Legal Code (the full license)](https://creativecommons.org/licenses/by/3.0/legalcode). ## You are free: @@ -33,7 +33,7 @@ Notice — For any reuse or distribution, you must make clear to others the lice # Attribution 3.0 Unported (CC BY 3.0) -http://creativecommons.org/licenses/by/3.0/legalcode +https://creativecommons.org/licenses/by/3.0/legalcode CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. @@ -100,4 +100,4 @@ Creative Commons Notice Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of this License. -Creative Commons may be contacted at http://creativecommons.org/. +Creative Commons may be contacted at https://creativecommons.org/. diff --git a/README.md b/README.md index cb8e95a..199a0ad 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ may be trying to do. If you would like to know more about a command listed, each command links to both the official manual page and its relevant chapter -in the [Pro Git book](http://git-scm.com/book). +in the [Pro Git book](https://git-scm.com/book). ## Contributing diff --git a/basic/index.html b/basic/index.html index 9e1dac8..f03a463 100644 --- a/basic/index.html +++ b/basic/index.html @@ -5,7 +5,7 @@

- book + book Basic Snapshotting

@@ -38,8 +38,8 @@

- docs   - book + docs   + book git add adds file contents to the staging area @@ -130,8 +130,8 @@

- docs   - book + docs   + book git status view the status of your files in the working directory and staging area @@ -214,8 +214,8 @@

- docs   - book + docs   + book git diff shows diff of what is staged and what is modified but unstaged @@ -224,7 +224,7 @@

There are two main uses of the git diff command. One use we will describe here, the other we will describe later in the - "Inspection and Comparison" + "Inspection and Comparison" section. The way we're going to use it here is to describe the changes that are staged or modified on disk but unstaged.

@@ -416,8 +416,8 @@

- docs   - book + docs   + book git commit records a snapshot of the staging area @@ -596,8 +596,8 @@

- docs   - book + docs   + book git reset undo changes and commits @@ -772,8 +772,8 @@

- docs   - book + docs   + book git rm remove files from the staging area @@ -828,8 +828,8 @@

- docs   - book + docs   + book git stash save changes made in the current index and working directory for later diff --git a/branching/index.html b/branching/index.html index bfe9530..5a14dac 100644 --- a/branching/index.html +++ b/branching/index.html @@ -5,7 +5,7 @@

- book + book Branching and Merging

@@ -38,8 +38,8 @@

- docs   - book + docs   + book git branch list, create and manage working contexts @@ -49,8 +49,8 @@

- docs   - book + docs   + book git checkout switch to a new branch context @@ -72,7 +72,7 @@

Without arguments, git branch will list out the local branches that you have. The branch that you are currently working on will have a star next to it and if you have - coloring turned on, + coloring turned on, will show the current branch in green.

@@ -273,8 +273,8 @@

- docs   - book + docs   + book git merge merge a branch context into your current one @@ -467,7 +467,7 @@

You can see that Git inserts standard merge conflict markers, much like Subversion, into files when it gets a merge conflict. Now it's up to us to resolve them. We will do it manually here, but check out - git mergetool + git mergetool if you want Git to fire up a graphical mergetool (like kdiff3, emerge, p4merge, etc) instead.

@@ -519,8 +519,8 @@

- docs   - book + docs   + book git log show commit history of a branch @@ -743,8 +743,8 @@

- docs   - book + docs   + book git tag tag a point in history as important diff --git a/creating/index.html b/creating/index.html index 29d2dea..1810af7 100644 --- a/creating/index.html +++ b/creating/index.html @@ -24,8 +24,8 @@

Getting and Creating Projects

- docs   - book + docs   + book git init initializes a directory as a Git repository @@ -79,8 +79,8 @@

- docs   - book + docs   + book git clone copy a git repository so you can add to it diff --git a/index.html b/index.html index 513e968..f7f6eeb 100644 --- a/index.html +++ b/index.html @@ -16,7 +16,7 @@

Introduction to the Git Reference

Each section will link to the next section, so it can be used as a tutorial. Every page will also link to more in-depth Git documentation such as the official manual pages and relevant - sections in the Pro Git book, + sections in the Pro Git book, so you can learn more about any of the commands. First, we'll start with thinking about source code management like Git does. @@ -67,7 +67,7 @@

How to Think Like Git

- $ wget http://example.com/project.2010-06-01.zip
+ $ wget https://example.com/project.2010-06-01.zip
  $ unzip project.2010-06-01.zip
  $ cp -R project.2010-06-01 project-my-copy
  $ cd project-my-copy
diff --git a/inspect/index.html b/inspect/index.html
index 32945eb..d449742 100644
--- a/inspect/index.html
+++ b/inspect/index.html
@@ -5,7 +5,7 @@
 

   

     
-      book
+      book
     
     Inspection and Comparison
   

@@ -30,8 +30,8 @@ 

 

   

     
-      docs  
-      book
+      docs  
+      book
     
     git log
     filter your commit history
@@ -309,8 +309,8 @@ 

 

   

     
-      docs  
-      book
+      docs  
+      book
     
     git diff
     
@@ -472,4 +472,4 @@ 

 

 
 
And that's it!  For more information, try reading the
-Pro Git book.

+Pro Git book.

diff --git a/remotes/index.html b/remotes/index.html
index a4c7dfc..a64bacc 100644
--- a/remotes/index.html
+++ b/remotes/index.html
@@ -5,7 +5,7 @@
 

   

     
-      book
+      book
     
     Sharing and Updating Projects
   

@@ -43,8 +43,8 @@ 

 

   

     
-      docs  
-      book
+      docs  
+      book
     
     git remote
     list, add and delete remote repository aliases
@@ -254,8 +254,8 @@ 

 

   

     
-      docs  
-      book
+      docs  
+      book
     
     git fetch
     download new branches and data from a remote repository
@@ -265,8 +265,8 @@ 

 
   

     
-      docs  
-      book
+      docs  
+      book
     
     git pull
     fetch from a remote repo and try to merge into the current branch
@@ -290,7 +290,7 @@ 

     fetch and merge commands separately involves less magic
     and less problems, but if you like the idea of pull, you can
     read about it in more detail in the
-    official docs.
+    official docs.
     

 
     
Assuming you have a remote all set up and you want to pull in updates, you
@@ -350,8 +350,8 @@ 

 

   

     
-      docs  
-      book
+      docs  
+      book
     
     git push
     push your new branches and data to a remote repository
diff --git a/zh/about.html b/zh/about.html
index 0cc739c..9630b89 100644
--- a/zh/about.html
+++ b/zh/about.html
@@ -5,5 +5,5 @@
   
谁的作品？

   
 
   
Git 参考手册是 Github 项目组的成果。

-  
逸才在 Git Reference 的基础上做了中文翻译。

+  
逸才在 Git Reference 的基础上做了中文翻译。

 

diff --git a/zh/basic/index.html b/zh/basic/index.html
index ecb2448..3c1c398 100644
--- a/zh/basic/index.html
+++ b/zh/basic/index.html
@@ -5,7 +5,7 @@
 

   

     
-      书
+      书
     
     基本快照
   

@@ -30,8 +30,8 @@ 

 

   

     
-      文档  
-      书
+      文档  
+      书
     
     git add
     添加文件到缓存
@@ -105,8 +105,8 @@ 

 

   

     
-      文档  
-      书
+      文档  
+      书
     
     git status
     查看你的文件在工作目录与缓存的状态
@@ -178,8 +178,8 @@ 

 

   

     
-      文档  
-      书
+      文档  
+      书
     
     git diff
     显示已写入缓存与已修改但尚未写入缓存的改动的区别
@@ -187,7 +187,7 @@ 

 
   

     
git diff 有两个主要的应用场景。我们将在此介绍其一，
-      在 检阅与对照 一章中，我们将介绍其二。
+      在 检阅与对照 一章中，我们将介绍其二。
       我们这里介绍的方式是用此命令描述已临时提交的或者已修改但尚未提交的改动。
     

 
@@ -364,8 +364,8 @@ 

 

   

     
-      文档  
-      书
+      文档  
+      书
     
     git commit
     记录缓存内容的快照
@@ -516,8 +516,8 @@ 

 

   

     
-      文档  
-      书
+      文档  
+      书
     
     git reset HEAD
     取消缓存已缓存的内容
@@ -595,8 +595,8 @@ 

 

   

     
-      文档  
-      书
+      文档  
+      书
     
     git rm
     将文件从缓存区移除
diff --git a/zh/branching/index.html b/zh/branching/index.html
index 4b97584..0e41574 100644
--- a/zh/branching/index.html
+++ b/zh/branching/index.html
@@ -5,7 +5,7 @@
 

   

     
-      书
+      书
     
     分支与合并
   

@@ -29,8 +29,8 @@ 

 

   

     
-      文档  
-      书
+      文档  
+      书
     
     git branch
     列出、创建与管理工作上下文
@@ -40,8 +40,8 @@ 

 
   

     
-      文档  
-      书
+      文档  
+      书
     
     git checkout
     切换到新的分支上下文
@@ -59,7 +59,7 @@ 

     

 
     
没有参数时，git branch 会列出你在本地的分支。你所在的分支的行首会有个星号作标记。
-      如果你开启了彩色模式，当前分支会用绿色显示。
+      如果你开启了彩色模式，当前分支会用绿色显示。
     

 
 
@@ -200,8 +200,8 @@ 

 

   

     
-      docs  
-      book
+      docs  
+      book
     
     git merge
     将分支合并到你的当前分支
@@ -381,7 +381,7 @@ 

 
     
你可以看到，Git 在产生合并冲突的地方插入了标准的与 Subversion 很像的合并冲突标记。
       轮到我们去解决这些冲突了。在这里我们就手动把它解决。如果你要 Git 打开一个图形化的合并工具，
-      可以看看 git 合并工具
+      可以看看 git 合并工具
       （比如 kdiff3、emerge、p4merge 等）。
     

 
@@ -429,8 +429,8 @@ 

 

   

     
-      文档  
-      书
+      文档  
+      书
     
     git log
     显示一个分支中提交的更改记录
@@ -620,8 +620,8 @@ 

 

   

     
-      文档  
-      书
+      文档  
+      书
     
     git tag
     给历史记录中的某个重要的一点打上标签
diff --git a/zh/creating/index.html b/zh/creating/index.html
index 0f4e05b..64a2ab9 100644
--- a/zh/creating/index.html
+++ b/zh/creating/index.html
@@ -19,8 +19,8 @@ 
获取与创建项目

 

   

     
-      文档  
-      书
+      文档  
+      书
     
     git init
     将一个目录初始化为 Git 仓库
@@ -69,8 +69,8 @@ 

 

   

     
-      文档   
-      书
+      文档   
+      书
     
     git clone
     复制一个 Git 仓库，以上下其手
diff --git a/zh/index.html b/zh/index.html
index 2c45e46..270dd98 100644
--- a/zh/index.html
+++ b/zh/index.html
@@ -10,7 +10,7 @@ 
Git 手册简介

     

     

       每个章节都有到下一个章节的链接，所以本手册也可以当作一个入门指导。
-      每个页面还有一个深度 Git 文档阅读的链接，比如官方的使用手册页面或者 《Pro Git》
+      每个页面还有一个深度 Git 文档阅读的链接，比如官方的使用手册页面或者 《Pro Git》
       书中的相关章节，以便于你学习了解更多的 Git 命令。首先，我们要从如何以 Git 的思维方式管理源代码开始。
     

   

@@ -47,7 +47,7 @@ 
如何以 Git 的方式思考

     

 
     
- $ wget http://example.com/project.2010-06-01.zip
+ $ wget https://example.com/project.2010-06-01.zip
  $ unzip project.2010-06-01.zip
  $ cp -R project.2010-06-01 project-my-copy
  $ cd project-my-copy
diff --git a/zh/inspect/index.html b/zh/inspect/index.html
index 0c5ae53..1641c17 100644
--- a/zh/inspect/index.html
+++ b/zh/inspect/index.html
@@ -5,7 +5,7 @@
 

   

     
-      书
+      书
     
     检查与比较
   

@@ -26,8 +26,8 @@ 

 

   

     
-      文档  
-      书k
+      文档  
+      书k
     
     git log
     过滤你的提交历史记录
@@ -293,8 +293,8 @@ 

 

   

     
-      文档  
-      书
+      文档  
+      书
     
     git diff
     
@@ -449,4 +449,4 @@ 

 

 
 
就是这样了！ 请阅读
-《Pro Git》 以获得更多信息。

+《Pro Git》 以获得更多信息。

diff --git a/zh/remotes/index.html b/zh/remotes/index.html
index 8489e12..7d74c78 100644
--- a/zh/remotes/index.html
+++ b/zh/remotes/index.html
@@ -5,7 +5,7 @@
 

   

     
-      书
+      书
     
     分享与更新项目
   

@@ -38,8 +38,8 @@ 

 

   

     
-      文档  
-      书
+      文档  
+      书
     
     git remote
     罗列、添加和删除远端仓库别名
@@ -147,8 +147,8 @@ 

 

   

     
-      文档  
-      书
+      文档  
+      书
     
     git fetch
     从远端仓库下载新分支与数据
@@ -158,8 +158,8 @@ 

 
   

     
-      文档  
-      书
+      文档  
+      书
     
     git pull
     从远端仓库提取数据并尝试合并到当前分支
@@ -179,7 +179,7 @@ 

       基本上，该命令就是在 git fetch 之后紧接着 git merge 远端分支到你所在的任意分支。
       我个人不太喜欢这命令 —— 我更喜欢 fetch 和 merge 分开来做。少点魔法，少点问题。
       不过，如果你喜欢这主意，你可以看一下 git pull 的
-      官方文档。
+      官方文档。
     

 
     

@@ -233,8 +233,8 @@ 

 

   

     
-      文档  
-      书
+      文档  
+      书
     
     git push
     推送你的新分支与数据到某个远端仓库