diff --git a/CNAME b/CNAME deleted file mode 100644 index d12aa3f..0000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -gitref.org diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..20f8676 --- /dev/null +++ b/_config.yml @@ -0,0 +1 @@ +baseurl: /git-reference diff --git a/_layouts/reference.html b/_layouts/reference.html index 9cb4cdf..78d8cd6 100755 --- a/_layouts/reference.html +++ b/_layouts/reference.html @@ -3,16 +3,16 @@ Git Reference - - - - - - - - - - + + + + + + + + + +
@@ -23,9 +23,9 @@
@@ -35,63 +35,63 @@
diff --git a/_layouts/zh_reference.html b/_layouts/zh_reference.html index 91ed1d2..333d225 100755 --- a/_layouts/zh_reference.html +++ b/_layouts/zh_reference.html @@ -3,16 +3,16 @@ Git 参考手册 - - - - - - - - - - + + + + + + + + + +
@@ -23,9 +23,9 @@
@@ -35,62 +35,62 @@
diff --git a/basic/index.html b/basic/index.html index acdb606..9e1dac8 100644 --- a/basic/index.html +++ b/basic/index.html @@ -730,7 +730,7 @@

dangerous option and is not working directory safe. Any changes not committed will be lost.

- +
 $ git status
 # On branch master
@@ -970,5 +970,4 @@ 

-

On to Branching and Merging »

- +

On to Branching and Merging »

diff --git a/branching/index.html b/branching/index.html index 96112be..bfe9530 100644 --- a/branching/index.html +++ b/branching/index.html @@ -150,7 +150,7 @@

see the last commit on each branch

-

If we want to see last commits on each branch +

If we want to see last commits on each branch we can run git branch -v to see them.

@@ -860,5 +860,4 @@ 

-

On to Sharing and Updating Projects »

- +

On to Sharing and Updating Projects »

diff --git a/creating/index.html b/creating/index.html index 449859a..29d2dea 100644 --- a/creating/index.html +++ b/creating/index.html @@ -6,7 +6,7 @@

Getting and Creating Projects

- In order to do anything in Git, you have to have a Git repository. This + In order to do anything in Git, you need to have a Git repository. This is where Git stores the data for the snapshots you are saving.

@@ -139,4 +139,4 @@

-

On to Basic Snapshotting »

+

On to Basic Snapshotting »

diff --git a/index.html b/index.html index a33d1d0..513e968 100644 --- a/index.html +++ b/index.html @@ -109,4 +109,4 @@

How to Think Like Git

-

On to Getting and Creating Projects »

+

On to Getting and Creating Projects »

diff --git a/remotes/index.html b/remotes/index.html index 94df417..a4c7dfc 100644 --- a/remotes/index.html +++ b/remotes/index.html @@ -151,7 +151,7 @@

rename remote aliases

-

If you want to rename remote aliases without having to delete them and add them again +

If you want to rename remote aliases without having to delete them and add them again you can do that by running git remote rename [old-alias] [new-alias]. This will allow you to modify the current name of the remote.

@@ -437,4 +437,4 @@

-

On to Inspection and Comparison »

+

On to Inspection and Comparison »

diff --git a/zh/basic/index.html b/zh/basic/index.html index e3ffd13..ecb2448 100644 --- a/zh/basic/index.html +++ b/zh/basic/index.html @@ -641,5 +641,4 @@

-

到 分支与合并 »

- +

到 分支与合并 »

diff --git a/zh/branching/index.html b/zh/branching/index.html index c706790..4b97584 100644 --- a/zh/branching/index.html +++ b/zh/branching/index.html @@ -696,5 +696,4 @@

-

到 分享与更新项目 »

- +

到 分享与更新项目 »

diff --git a/zh/creating/index.html b/zh/creating/index.html index 4ed22c2..0f4e05b 100644 --- a/zh/creating/index.html +++ b/zh/creating/index.html @@ -120,4 +120,4 @@

-

接下来:基本快照 »

+

接下来:基本快照 »

diff --git a/zh/index.html b/zh/index.html index 4a74633..2c45e46 100644 --- a/zh/index.html +++ b/zh/index.html @@ -79,4 +79,4 @@

如何以 Git 的方式思考

-

接下来:获取与创建项目»

+

接下来:获取与创建项目»

diff --git a/zh/remotes/index.html b/zh/remotes/index.html index 0b5028c..8489e12 100644 --- a/zh/remotes/index.html +++ b/zh/remotes/index.html @@ -12,7 +12,7 @@

Git 并不像 Subversion 那样有个中心服务器。 - 目前为止所有的命令都是本地执行的,更新的知识本地的数据库。 + 目前为止所有的命令都是本地执行的,更新的只是本地的数据库。 要通过 Git 与其他开发者合作,你需要将数据放到一台其他开发者能够连接的服务器上。 Git 实现此流程的方式是将你的数据与另一个仓库同步。在服务器与客户端之间并没有实质的区别 —— Git 仓库就是 Git 仓库,你可以很容易地在两者之间同步。 @@ -318,4 +318,4 @@

-

到 检查与比较»

+

到 检查与比较»