diff options
| -rwxr-xr-x | _layouts/reference.html | 2 | ||||
| -rwxr-xr-x | _layouts/zh_reference.html | 2 | ||||
| -rw-r--r-- | basic/index.html | 13 | ||||
| -rw-r--r-- | css/layout.css | 1 | ||||
| -rw-r--r-- | zh/remotes/index.html | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/_layouts/reference.html b/_layouts/reference.html index 9cb4cdf..58033c6 100755 --- a/_layouts/reference.html +++ b/_layouts/reference.html @@ -69,9 +69,9 @@ <div class="block"> <h3><a href="/remotes">Sharing and Updating Projects</a></h3> <ul> + <li><a href="/remotes/#remote">remote</a></li> <li><a href="/remotes/#fetch">fetch, pull</a></li> <li><a href="/remotes/#push">push</a></li> - <li><a href="/remotes/#remote">remote</a></li> </ul> </div> diff --git a/_layouts/zh_reference.html b/_layouts/zh_reference.html index 7bb3837..91ed1d2 100755 --- a/_layouts/zh_reference.html +++ b/_layouts/zh_reference.html @@ -27,7 +27,7 @@ <!-- <li><a id="menu_cookbook" href="/zh/cookbook.html">Cookbook</a></li> --> <li><a id="menu_about" href="/zh/about.html">关于</a></li> <li>§</li> - <li><a href="https://github.com/github/git-reference">网站源码</a></li> + <li><a href="https://github.com/git/git-reference">网站源码</a></li> </ul> <br/> diff --git a/basic/index.html b/basic/index.html index b381b86..acdb606 100644 --- a/basic/index.html +++ b/basic/index.html @@ -724,12 +724,13 @@ nothing to commit (working directory clean) <small>unstage files AND undo any changes in the working directory since last commit</small> </h4> - <p>The third option is to go <code>--hard</code> and make your working - directory look like the index, unstage files and undo any changes made - since the last commit. - This is the most dangerous option and not working directory safe. Any - changes not in the index or have not been commited will be lost.</p> - + <p>The third option is to go <code>--hard</code>. This command discards your staged changes and + the changes in your working directory. In other words: it resets your staging area and working + directory to the state they were in at the given commit. This is the most + dangerous option and is not working directory safe. Any changes not committed will + be lost. + </p> + <pre> <b>$ git status</b> # On branch master diff --git a/css/layout.css b/css/layout.css index af99af3..799b6ec 100644 --- a/css/layout.css +++ b/css/layout.css @@ -205,7 +205,6 @@ h1 a { padding:8px; margin-bottom:0; color: #333; - background: #fff; } diff --git a/zh/remotes/index.html b/zh/remotes/index.html index 0b5028c..20fba86 100644 --- a/zh/remotes/index.html +++ b/zh/remotes/index.html @@ -12,7 +12,7 @@ layout: zh_reference <div class="block"> <p> Git 并不像 Subversion 那样有个中心服务器。 - 目前为止所有的命令都是本地执行的，更新的知识本地的数据库。 + 目前为止所有的命令都是本地执行的，更新的只是本地的数据库。 要通过 Git 与其他开发者合作，你需要将数据放到一台其他开发者能够连接的服务器上。 Git 实现此流程的方式是将你的数据与另一个仓库同步。在服务器与客户端之间并没有实质的区别 —— Git 仓库就是 Git 仓库，你可以很容易地在两者之间同步。 |