[zh] Corrections of Chapter 2 #379

Merged
merged 1 commit into from Mar 1, 2013

Conversation

Projects
None yet
2 participants
Contributor

iissnan commented Mar 1, 2013

No description provided.

@iissnan iissnan commented on the diff Mar 1, 2013

zh/02-git-basics/01-chapter2.markdown
$ git status
# On branch master
nothing to commit (working directory clean)
-这说明你现在的工作目录相当干净。换句话说,当前没有任何跟踪着的文件,也没有任何文件在上次提交后更改过。此外,上面的信息还表明,当前目录下没有出现任何处于未跟踪的新文件,否则 Git 会在这里列出来。最后,该命令还显示了当前所在的分支是 master,这是默认的分支名称,实际是可以修改的,现在先不用考虑。下一章我们就会详细讨论分支和引用。
@iissnan

iissnan Mar 1, 2013

Contributor

原文是:in other words, no tracked files are modified.
原翻译:换句话说,当前没有任何跟踪着的文件,也没有任何文件在上次提交后更改过。
纠正为:换句话说,所有已跟踪文件在上次提交后都未被更改过。

@iissnan iissnan commented on the diff Mar 1, 2013

zh/02-git-basics/01-chapter2.markdown
@@ -70,7 +70,7 @@ Insert 18333fig0201.png
# README
nothing added to commit but untracked files present (use "git add" to track)
-就是在“Untracked files”这行下面。Git 不会自动将之纳入跟踪范围,除非你明明白白地告诉它“我需要跟踪该文件”,因而不用担心把临时文件什么的也归入版本管理。不过现在的例子中,我们确实想要跟踪管理 README 这个文件。
@iissnan

iissnan Mar 1, 2013

Contributor

原文是:You can see that your new README file is untracked, because it’s under the “Untracked files” heading in your status output. Untracked basically means that Git sees a file you didn’t have in the previous snapshot (commit);
原翻译:就是在“Untracked files”这行下面。
纠正为:在状态报告中可以看到新建的README文件出现在“Untracked files”下面。未跟踪的文件意味着Git在之前的快照(提交)中没有这些文件;

原翻译太过于简略。

Member

jnavila commented Mar 1, 2013

@iissnan Why did you comment your own pull request? Is it ready for merge or are you waiting for some review?

Contributor

iissnan commented Mar 1, 2013

@jnavila I am not very sure if there was someone who would review the changes. If there was, then the comment is for him and the comments show why the changes were made clearly. :-)

Contributor

iissnan commented Mar 1, 2013

@jnavila This pull request is ready for merge.

jnavila merged commit 1dff88c into progit:master Mar 1, 2013

Member

jnavila commented Mar 1, 2013

Merged. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment