Skip to content

Commit 7d8f798

Browse files
committed
some small changes and typos
1 parent 560f751 commit 7d8f798

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

en/book/01-introduction/chapter1.asc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ You will see these hash values all over the place in Git because it uses them so
9696

9797
==== Git Generally Only Adds Data
9898

99-
When you do actions in Git, nearly all of them only add data to the Git database. It is very difficult to get the system to do anything that is not undoable or to make it erase data in any way. As in any VCS, you can lose or mess up changes you haven’t committed yet; but after you commit a snapshot into Git, it is very difficult to lose, especially if you regularly push your database to another repository.
99+
When you do actions in Git, nearly all of them only add data to the Git database. It is hard to get the system to do anything that is not undoable or to make it erase data in any way. As in any VCS, you can lose or mess up changes you haven’t committed yet; but after you commit a snapshot into Git, it is very difficult to lose, especially if you regularly push your database to another repository.
100100

101101
This makes using Git a joy because we know we can experiment without the danger of severely screwing things up. For a more in-depth look at how Git stores its data and how you can recover data that seems lost, see <<_git_objects>>.
102102

@@ -113,15 +113,15 @@ The Git directory is where Git stores the metadata and object database for your
113113

114114
The working directory is a single checkout of one version of the project. These files are pulled out of the compressed database in the Git directory and placed on disk for you to use or modify.
115115

116-
The staging area is a simple file, generally contained in your Git directory, that stores information about what will go into your next commit. It’s sometimes referred to as the index, but it’s becoming standard to refer to it as the staging area.
116+
The staging area is a simple file, generally contained in your Git directory, that stores information about what will go into your next commit. It’s sometimes referred to as the index, but it’s also common to refer to it as the staging area.
117117

118118
The basic Git workflow goes something like this:
119119

120120
1. You modify files in your working directory.
121121
2. You stage the files, adding snapshots of them to your staging area.
122122
3. You do a commit, which takes the files as they are in the staging area and stores that snapshot permanently to your Git directory.
123123

124-
If a particular version of a file is in the git directory, it’s considered committed. If it’s modified but has been added to the staging area, it is staged. And if it was changed since it was checked out but has not been staged, it is modified. In <<_git_basics_chapter>>, you’ll learn more about these states and how you can either take advantage of them or skip the staged part entirely.
124+
If a particular version of a file is in the Git directory, it’s considered committed. If it’s modified but has been added to the staging area, it is staged. And if it was changed since it was checked out but has not been staged, it is modified. In <<_git_basics_chapter>>, you’ll learn more about these states and how you can either take advantage of them or skip the staged part entirely.
125125

126126
=== Installing Git
127127

0 commit comments

Comments
 (0)