Update progit, kernel links to git-scm in Chinese translation
Soon Van committed
Dec 15, 2012 at 15:28 UTC
58b735e7fc56434ed91589cb43b71abbdd82c188
5 files changed
+41
-41
zh/basic/index.html
+13
-13
@@ -5,7 +5,7 @@ layout: zh_reference
5
<div class="box">
6
<h2>
7
<span class="docs">
8
- <a target="new" href="http://progit.org/book/ch2-2.html">书</a>
8
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository">书</a>
9
</span>
10
基本快照
11
</h2>
@@ -30,8 +30,8 @@ layout: zh_reference
30
<div class="box">
31
<h2>
32
<span class="docs">
33
- <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-add.html">文档</a>
34
- <a target="new" href="http://progit.org/book/ch2-2.html#tracking_new_files">书</a>
33
+ <a target="new" href="http://git-scm.com/docs/git-add">文档</a>
34
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Tracking-New-Files">书</a>
35
</span>
36
<a name="add">git add</a>
37
<span class="desc">添加文件到缓存</span>
@@ -105,8 +105,8 @@ layout: zh_reference
105
<div class="box">
106
<h2>
107
<span class="docs">
108
- <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-status.html">文档</a>
109
- <a target="new" href="http://progit.org/book/ch2-2.html#checking_the_status_of_your_files">书</a>
108
+ <a target="new" href="http://git-scm.com/docs/git-status">文档</a>
109
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Checking-the-Status-of-Your-Files">书</a>
110
</span>
111
<a name="status">git status</a>
112
<span class="desc">查看你的文件在工作目录与缓存的状态</span>
@@ -178,8 +178,8 @@ layout: zh_reference
178
<div class="box">
179
<h2>
180
<span class="docs">
181
- <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-diff.html">文档</a>
182
- <a target="new" href="http://progit.org/book/ch2-2.html#viewing_your_staged_and_unstaged_changes">书</a>
181
+ <a target="new" href="http://git-scm.com/docs/git-diff">文档</a>
182
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Viewing-Your-Staged-and-Unstaged-Changes">书</a>
183
</span>
184
<a name="diff">git diff</a>
185
<span class="desc">显示已写入缓存与已修改但尚未写入缓存的改动的区别</span>
@@ -364,8 +364,8 @@ index 2aabb6e..2ae9ba4 100644
364
<div class="box">
365
<h2>
366
<span class="docs">
367
- <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-commit.html">文档</a>
368
- <a target="new" href="http://progit.org/book/ch2-2.html#committing_your_changes">书</a>
367
+ <a target="new" href="http://git-scm.com/docs/git-commit">文档</a>
368
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Committing-Your-Changes">书</a>
369
</span>
370
<a name="commit">git commit</a>
371
<span class="desc">记录缓存内容的快照</span>
@@ -516,8 +516,8 @@ nothing to commit (working directory clean)
516
<div class="box">
517
<h2>
518
<span class="docs">
519
- <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-reset.html">文档</a>
520
- <a target="new" href="http://progit.org/book/ch2-4.html#unstaging_a_staged_file">书</a>
519
+ <a target="new" href="http://git-scm.com/docs/git-reset">文档</a>
520
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Undoing-Things#Unstaging-a-Staged-File">书</a>
521
</span>
522
<a name="reset">git reset HEAD</a>
523
<span class="desc">取消缓存已缓存的内容</span>
@@ -595,8 +595,8 @@ M hello.rb
595
<div class="box">
596
<h2>
597
<span class="docs">
598
- <a href="http://www.kernel.org/pub/software/scm/git/docs/git-rm.html">文档</a>
599
- <a href="http://progit.org/book/ch2-2.html#removing_files">书</a>
598
+ <a href="http://git-scm.com/docs/git-rm">文档</a>
599
+ <a href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Removing-Files">书</a>
600
</span>
601
<a name="rm-mv">git rm</a>
602
<span class="desc">将文件从缓存区移除</span>
zh/branching/index.html
+13
-13
@@ -5,7 +5,7 @@ layout: zh_reference
5
<div class="box">
6
<h2>
7
<span class="docs">
8
- <a target="new" href="http://progit.org/book/ch3-0.html">书</a>
8
+ <a target="new" href="http://git-scm.com/book/en/Git-Branching">书</a>
9
</span>
10
分支与合并
11
</h2>
@@ -29,8 +29,8 @@ layout: zh_reference
29
<div class="box">
30
<h2>
31
<span class="docs">
32
- <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-branch.html">文档</a>
33
- <a target="new" href="http://progit.org/book/ch3-2.html">书</a>
32
+ <a target="new" href="http://git-scm.com/docs/git-branch">文档</a>
33
+ <a target="new" href="http://git-scm.com/book/en/Git-Branching-What-a-Branch-Is">书</a>
34
</span>
35
<a name="branch">git branch</a>
36
<span class="desc">列出、创建与管理工作上下文</span>
@@ -40,8 +40,8 @@ layout: zh_reference
40
41
<h2>
42
<span class="docs">
43
- <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html">文档</a>
44
- <a target="new" href="http://progit.org/book/ch3-2.html">书</a>
43
+ <a target="new" href="http://git-scm.com/docs/git-checkout">文档</a>
44
+ <a target="new" href="http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging">书</a>
45
</span>
46
<a name="checkout">git checkout</a>
47
<span class="desc">切换到新的分支上下文</span>
@@ -59,7 +59,7 @@ layout: zh_reference
59
</h4>
60
61
<p>没有参数时，<code>git branch</code> 会列出你在本地的分支。你所在的分支的行首会有个星号作标记。
62
- 如果你开启了<a href="http://progit.org/book/ch7-1.html#colors_in_git">彩色模式</a>，当前分支会用绿色显示。
62
+ 如果你开启了<a href="http://git-scm.com/book/en/Customizing-Git-Git-Configuration#Colors-in-Git">彩色模式</a>，当前分支会用绿色显示。
63
</p>
64
65
<pre>
@@ -199,8 +199,8 @@ Deleted branch testing (was 78b2670).
199
<div class="box">
200
<h2>
201
<span class="docs">
202
- <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-merge.html">docs</a>
203
- <a target="new" href="http://progit.org/book/ch3-2.html#basic_merging">book</a>
202
+ <a target="new" href="http://git-scm.com/docs/git-merge">docs</a>
203
+ <a target="new" href="http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merging">book</a>
204
</span>
205
<a name="merge">git merge</a>
206
<span class="desc">将分支合并到你的当前分支</span>
@@ -380,7 +380,7 @@ nearly every programming language.
380
381
<p>你可以看到，Git 在产生合并冲突的地方插入了标准的与 Subversion 很像的合并冲突标记。
382
轮到我们去解决这些冲突了。在这里我们就手动把它解决。如果你要 Git 打开一个图形化的合并工具，
383
- 可以看看 <a href="http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html">git 合并工具</a>
383
+ 可以看看 <a href="http://git-scm.com/docs/git-mergetool">git 合并工具</a>
384
（比如 kdiff3、emerge、p4merge 等）。
385
</p>
386
@@ -428,8 +428,8 @@ M README
428
<div class="box">
429
<h2>
430
<span class="docs">
431
- <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-log.html">文档</a>
432
- <a target="new" href="http://progit.org/book/ch6-1.html#commit_ranges">书</a>
431
+ <a target="new" href="http://git-scm.com/docs/git-log">文档</a>
432
+ <a target="new" href="http://git-scm.com/book/en/Git-Tools-Revision-Selection#Commit-Ranges">书</a>
433
</span>
434
<a name="log">git log</a>
435
<span class="desc">显示一个分支中提交的更改记录</span>
@@ -619,8 +619,8 @@ ab5ab4c added erlang
619
<div class="box">
620
<h2>
621
<span class="docs">
622
- <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-tag.html">文档</a>
623
- <a target="new" href="http://progit.org/book/ch2-6.html">书</a>
622
+ <a target="new" href="http://git-scm.com/docs/git-tag">文档</a>
623
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Tagging">书</a>
624
</span>
625
<a name="tag">git tag</a>
626
<span class="desc">给历史记录中的某个重要的一点打上标签</span>
zh/creating/index.html
+4
-4
@@ -19,8 +19,8 @@ layout: zh_reference
19
<div class="box">
20
<h2>
21
<span class="docs">
22
- <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-init.html">文档</a>
23
- <a target="new" href="http://progit.org/book/ch2-1.html#initializing_a_repository_in_an_existing_directory">书</a>
22
+ <a target="new" href="http://git-scm.com/docs/git-init">文档</a>
23
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository#Initializing-a-Repository-in-an-Existing-Directory">书</a>
24
</span>
25
<a name="init">git init</a>
26
<span class="desc">将一个目录初始化为 Git 仓库</span>
@@ -67,8 +67,8 @@ Initialized empty Git repository in /opt/konichiwa/.git/
67
<div class="box">
68
<h2>
69
<span class="docs">
70
- <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-clone.html">文档 </a>
71
- <a target="new" href="http://progit.org/book/ch2-1.html#cloning_an_existing_repository">书</a>
70
+ <a target="new" href="http://git-scm.com/docs/git-clone">文档 </a>
71
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository#Cloning-an-Existing-Repository">书</a>
72
</span>
73
<a name="clone">git clone</a>
74
<span class="desc">复制一个 Git 仓库，以上下其手</span>
zh/inspect/index.html
+6
-6
@@ -5,7 +5,7 @@ layout: zh_reference
5
<div class="box">
6
<h2>
7
<span class="docs">
8
- <a target="new" href="http://progit.org/book/ch2-3.html">书</a>
8
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Viewing-the-Commit-History">书</a>
9
</span>
10
检查与比较
11
</h2>
@@ -26,8 +26,8 @@ layout: zh_reference
26
<div class="box">
27
<h2>
28
<span class="docs">
29
- <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-log.html">文档</a>
30
- <a target="new" href="http://progit.org/book/ch2-3.html">书k</a>
29
+ <a target="new" href="http://git-scm.com/docs/git-log">文档</a>
30
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Viewing-the-Commit-History#Limiting-Log-Output">书k</a>
31
</span>
32
<a name="log">git log</a>
33
<span class="desc">过滤你的提交历史记录</span>
@@ -293,8 +293,8 @@ Date: Fri Jun 4 12:58:53 2010 +0200
293
<div class="box">
294
<h2>
295
<span class="docs">
296
- <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-diff.html">文档</a>
297
- <a target="new" href="http://progit.org/book/ch5-3.html#determining_what_is_introduced">书</a>
296
+ <a target="new" href="http://git-scm.com/docs/git-diff">文档</a>
297
+ <a target="new" href="http://git-scm.com/book/en/Distributed-Git-Maintaining-a-Project#Determining-What-Is-Introduced">书</a>
298
</span>
299
<a name="diff">git diff</a>
300
<span class="desc"></span>
@@ -449,4 +449,4 @@ index bb86f00..192151c 100644
449
</div>
450
451
<p>就是这样了！ 请阅读
452
-<a href="http://progit.org">《Pro Git》</a> 以获得更多信息。</p>
452
+<a href="http://git-scm.com/book/">《Pro Git》</a> 以获得更多信息。</p>
zh/remotes/index.html
+5
-5
@@ -5,7 +5,7 @@ layout: zh_reference
5
<div class="box">
6
<h2>
7
<span class="docs">
8
- <a target="new" href="http://progit.org/book/ch2-5.html">书</a>
8
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Working-with-Remotes">书</a>
9
</span>
10
分享与更新项目
11
</h2>
@@ -39,7 +39,7 @@ layout: zh_reference
39
<h2>
40
<span class="docs">
41
<a target="new" href="http://git-scm.com/docs/git-remote">文档</a>
42
- <a target="new" href="http://progit.org/book/ch2-5.html#showing_your_remotes">书</a>
42
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Working-with-Remotes#Showing-Your-Remotes">书</a>
43
</span>
44
<a name="remote">git remote</a>
45
<span class="desc">罗列、添加和删除远端仓库别名</span>
@@ -148,7 +148,7 @@ github git@github.com:schacon/hw.git (push)
148
<h2>
149
<span class="docs">
150
<a target="new" href="http://git-scm.com/docs/git-fetch">文档</a>
151
- <a target="new" href="http://progit.org/book/ch2-5.html#fetching_and_pulling_from_your_remotes">书</a>
151
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Working-with-Remotes#Fetching-and-Pulling-from-Your-Remotes">书</a>
152
</span>
153
<a name="fetch">git fetch</a>
154
<span class="desc">从远端仓库下载新分支与数据</span>
@@ -159,7 +159,7 @@ github git@github.com:schacon/hw.git (push)
159
<h2>
160
<span class="docs">
161
<a target="new" href="http://git-scm.com/docs/git-pull">文档</a>
162
- <a target="new" href="http://progit.org/book/">书</a>
162
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Working-with-Remotes#Fetching-and-Pulling-from-Your-Remotes">书</a>
163
</span>
164
<a name="pull">git pull</a>
165
<span class="desc">从远端仓库提取数据并尝试合并到当前分支</span>
@@ -234,7 +234,7 @@ From github.com:schacon/hw
234
<h2>
235
<span class="docs">
236
<a target="new" href="http://git-scm.com/docs/git-push">文档</a>
237
- <a target="new" href="http://progit.org/book/ch2-5.html#pushing_to_your_remotes">书</a>
237
+ <a target="new" href="http://git-scm.com/book/en/Git-Basics-Working-with-Remotes#Pushing-to-Your-Remotes">书</a>
238
</span>
239
<a name="push">git push</a>
240
<span class="desc">推送你的新分支与数据到某个远端仓库</span>