Skip to content

Add the missing character #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
networm merged 3 commits into from
Apr 3, 2019
Merged

Add the missing character #367

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
338a402
add the missing character
ChuckieChen945 Apr 3, 2019
7408ee6
Merge pull request #1 from 591097213/591097213-patch-1
ChuckieChen945 Apr 3, 2019
392ea9b
fix some grammatical errors
ChuckieChen945 Apr 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions book/01-introduction/sections/basics.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Git 中所有数据在存储前都计算校验和，然后以校验和来引用
若你在传送过程中丢失信息或损坏文件，Git 就能发现。

Git 用以计算校验和的机制叫做 SHA-1 散列（hash，哈希）。(((SHA-1)))
这是一个由 40 个十六进制字符（0-9 和 a-f）组成字符串，基于 Git 中文件的内容或目录结构计算出来。
这是一个由 40 个十六进制字符（0-9 和 a-f）组成的字符串，基于 Git 中文件的内容或目录结构计算出来。
SHA-1 哈希看起来是这样：

[source]
Expand Down Expand Up @@ -102,7 +102,7 @@ Git 仓库目录是 Git 用来保存项目的元数据和对象数据库的地
2. 暂存文件，将文件的快照放入暂存区域。
3. 提交更新，找到暂存区域的文件，将快照永久性存储到 Git 仓库目录。

如果 Git 目录中保存着的特定版本文件，就属于已提交状态。
如果 Git 目录中保存着特定版本的文件，就属于已提交状态。
如果作了修改并已放入暂存区域，就属于已暂存状态。
如果自上次取出后，作了修改但还没有放到暂存区域，就是已修改状态。
在<<ch02-git-basics#ch02-git-basics>>一章，你会进一步了解这些状态的细节，并学会如何根据文件状态实施后续操作，以及怎样跳过暂存直接提交。