Skip to content

Commit 58b735e

Browse files
committed
Update progit, kernel links to git-scm in Chinese translation
1 parent d2b7dce commit 58b735e

File tree

5 files changed

+41
-41
lines changed

5 files changed

+41
-41
lines changed

zh/basic/index.html

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="box">
66
<h2>
77
<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>
99
</span>
1010
基本快照
1111
</h2>
@@ -30,8 +30,8 @@ <h2>
3030
<div class="box">
3131
<h2>
3232
<span class="docs">
33-
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-add.html">文档</a> &nbsp;
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> &nbsp;
34+
<a target="new" href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Tracking-New-Files"></a>
3535
</span>
3636
<a name="add">git add</a>
3737
<span class="desc">添加文件到缓存</span>
@@ -105,8 +105,8 @@ <h2>
105105
<div class="box">
106106
<h2>
107107
<span class="docs">
108-
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-status.html">文档</a> &nbsp;
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> &nbsp;
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>
110110
</span>
111111
<a name="status">git status</a>
112112
<span class="desc">查看你的文件在工作目录与缓存的状态</span>
@@ -178,8 +178,8 @@ <h2>
178178
<div class="box">
179179
<h2>
180180
<span class="docs">
181-
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-diff.html">文档</a> &nbsp;
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> &nbsp;
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>
183183
</span>
184184
<a name="diff">git diff</a>
185185
<span class="desc">显示已写入缓存与已修改但尚未写入缓存的改动的区别</span>
@@ -364,8 +364,8 @@ <h4>
364364
<div class="box">
365365
<h2>
366366
<span class="docs">
367-
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-commit.html">文档</a> &nbsp;
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> &nbsp;
368+
<a target="new" href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Committing-Your-Changes"></a>
369369
</span>
370370
<a name="commit">git commit</a>
371371
<span class="desc">记录缓存内容的快照</span>
@@ -516,8 +516,8 @@ <h4>
516516
<div class="box">
517517
<h2>
518518
<span class="docs">
519-
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-reset.html">文档</a> &nbsp;
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> &nbsp;
520+
<a target="new" href="http://git-scm.com/book/en/Git-Basics-Undoing-Things#Unstaging-a-Staged-File"></a>
521521
</span>
522522
<a name="reset">git reset HEAD</a>
523523
<span class="desc">取消缓存已缓存的内容</span>
@@ -595,8 +595,8 @@ <h2>
595595
<div class="box">
596596
<h2>
597597
<span class="docs">
598-
<a href="http://www.kernel.org/pub/software/scm/git/docs/git-rm.html">文档</a> &nbsp;
599-
<a href="http://progit.org/book/ch2-2.html#removing_files"></a>
598+
<a href="http://git-scm.com/docs/git-rm">文档</a> &nbsp;
599+
<a href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Removing-Files"></a>
600600
</span>
601601
<a name="rm-mv">git rm</a>
602602
<span class="desc">将文件从缓存区移除</span>

zh/branching/index.html

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="box">
66
<h2>
77
<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>
99
</span>
1010
分支与合并
1111
</h2>
@@ -29,8 +29,8 @@ <h2>
2929
<div class="box">
3030
<h2>
3131
<span class="docs">
32-
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-branch.html">文档</a> &nbsp;
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> &nbsp;
33+
<a target="new" href="http://git-scm.com/book/en/Git-Branching-What-a-Branch-Is"></a>
3434
</span>
3535
<a name="branch">git branch</a>
3636
<span class="desc">列出、创建与管理工作上下文</span>
@@ -40,8 +40,8 @@ <h2>
4040

4141
<h2>
4242
<span class="docs">
43-
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html">文档</a> &nbsp;
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> &nbsp;
44+
<a target="new" href="http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging"></a>
4545
</span>
4646
<a name="checkout">git checkout</a>
4747
<span class="desc">切换到新的分支上下文</span>
@@ -59,7 +59,7 @@ <h4>
5959
</h4>
6060

6161
<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>,当前分支会用绿色显示。
6363
</p>
6464

6565
<pre>
@@ -199,8 +199,8 @@ <h4>
199199
<div class="box">
200200
<h2>
201201
<span class="docs">
202-
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-merge.html">docs</a> &nbsp;
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> &nbsp;
203+
<a target="new" href="http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merging">book</a>
204204
</span>
205205
<a name="merge">git merge</a>
206206
<span class="desc">将分支合并到你的当前分支</span>
@@ -380,7 +380,7 @@ <h4>
380380

381381
<p>你可以看到,Git 在产生合并冲突的地方插入了标准的与 Subversion 很像的合并冲突标记。
382382
轮到我们去解决这些冲突了。在这里我们就手动把它解决。如果你要 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>
384384
(比如 kdiff3、emerge、p4merge 等)。
385385
</p>
386386

@@ -428,8 +428,8 @@ <h4>
428428
<div class="box">
429429
<h2>
430430
<span class="docs">
431-
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-log.html">文档</a> &nbsp;
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> &nbsp;
432+
<a target="new" href="http://git-scm.com/book/en/Git-Tools-Revision-Selection#Commit-Ranges"></a>
433433
</span>
434434
<a name="log">git log</a>
435435
<span class="desc">显示一个分支中提交的更改记录</span>
@@ -619,8 +619,8 @@ <h2>
619619
<div class="box">
620620
<h2>
621621
<span class="docs">
622-
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-tag.html">文档</a> &nbsp;
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> &nbsp;
623+
<a target="new" href="http://git-scm.com/book/en/Git-Basics-Tagging"></a>
624624
</span>
625625
<a name="tag">git tag</a>
626626
<span class="desc">给历史记录中的某个重要的一点打上标签</span>

zh/creating/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ <h2>获取与创建项目</h2>
1919
<div class="box">
2020
<h2>
2121
<span class="docs">
22-
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-init.html">文档</a> &nbsp;
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> &nbsp;
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>
2424
</span>
2525
<a name="init">git init</a>
2626
<span class="desc">将一个目录初始化为 Git 仓库</span>
@@ -67,8 +67,8 @@ <h2>
6767
<div class="box">
6868
<h2>
6969
<span class="docs">
70-
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-clone.html">文档 </a> &nbsp;
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> &nbsp;
71+
<a target="new" href="http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository#Cloning-an-Existing-Repository"></a>
7272
</span>
7373
<a name="clone">git clone</a>
7474
<span class="desc">复制一个 Git 仓库,以上下其手</span>

zh/inspect/index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="box">
66
<h2>
77
<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>
99
</span>
1010
检查与比较
1111
</h2>
@@ -26,8 +26,8 @@ <h2>
2626
<div class="box">
2727
<h2>
2828
<span class="docs">
29-
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-log.html">文档</a> &nbsp;
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> &nbsp;
30+
<a target="new" href="http://git-scm.com/book/en/Git-Basics-Viewing-the-Commit-History#Limiting-Log-Output">书k</a>
3131
</span>
3232
<a name="log">git log</a>
3333
<span class="desc">过滤你的提交历史记录</span>
@@ -293,8 +293,8 @@ <h4>
293293
<div class="box">
294294
<h2>
295295
<span class="docs">
296-
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-diff.html">文档</a> &nbsp;
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> &nbsp;
297+
<a target="new" href="http://git-scm.com/book/en/Distributed-Git-Maintaining-a-Project#Determining-What-Is-Introduced"></a>
298298
</span>
299299
<a name="diff">git diff</a>
300300
<span class="desc"></span>
@@ -449,4 +449,4 @@ <h2>
449449
</div>
450450

451451
<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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="box">
66
<h2>
77
<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>
99
</span>
1010
分享与更新项目
1111
</h2>
@@ -39,7 +39,7 @@ <h2>
3939
<h2>
4040
<span class="docs">
4141
<a target="new" href="http://git-scm.com/docs/git-remote">文档</a> &nbsp;
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>
4343
</span>
4444
<a name="remote">git remote</a>
4545
<span class="desc">罗列、添加和删除远端仓库别名</span>
@@ -148,7 +148,7 @@ <h4>
148148
<h2>
149149
<span class="docs">
150150
<a target="new" href="http://git-scm.com/docs/git-fetch">文档</a> &nbsp;
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>
152152
</span>
153153
<a name="fetch">git fetch</a>
154154
<span class="desc">从远端仓库下载新分支与数据</span>
@@ -159,7 +159,7 @@ <h2>
159159
<h2>
160160
<span class="docs">
161161
<a target="new" href="http://git-scm.com/docs/git-pull">文档</a> &nbsp;
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>
163163
</span>
164164
<a name="pull">git pull</a>
165165
<span class="desc">从远端仓库提取数据并尝试合并到当前分支</span>
@@ -234,7 +234,7 @@ <h2>
234234
<h2>
235235
<span class="docs">
236236
<a target="new" href="http://git-scm.com/docs/git-push">文档</a> &nbsp;
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>
238238
</span>
239239
<a name="push">git push</a>
240240
<span class="desc">推送你的新分支与数据到某个远端仓库</span>

0 commit comments

Comments
 (0)