Skip to content

Commit c9ad607

Browse files
authored
Merge pull request #1677 from bkline/tracked-files
Fix descriptions of untracked files
2 parents 362552f + 33df1d7 commit c9ad607

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

book/02-git-basics/sections/recording-changes.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ At this point, you should have a _bona fide_ Git repository on your local machin
44
Typically, you'll want to start making changes and committing snapshots of those changes into your repository each time the project reaches a state you want to record.
55

66
Remember that each file in your working directory can be in one of two states: _tracked_ or _untracked_.
7-
Tracked files are files that were in the last snapshot; they can be unmodified, modified, or staged.
7+
Tracked files are files that were in the last snapshot, as well as any newly staged files; they can be unmodified, modified, or staged.
88
In short, tracked files are files that Git knows about.
99

1010
Untracked files are everything else -- any files in your working directory that were not in your last snapshot and are not in your staging area.
@@ -54,7 +54,7 @@ nothing added to commit but untracked files present (use "git add" to track)
5454
----
5555

5656
You can see that your new `README` file is untracked, because it's under the "`Untracked files`" heading in your status output.
57-
Untracked basically means that Git sees a file you didn't have in the previous snapshot (commit); Git won't start including it in your commit snapshots until you explicitly tell it to do so.
57+
Untracked basically means that Git sees a file you didn't have in the previous snapshot (commit), and which hasn't yet been staged; Git won't start including it in your commit snapshots until you explicitly tell it to do so.
5858
It does this so you don't accidentally begin including generated binary files or other files that you did not mean to include.
5959
You do want to start including `README`, so let's start tracking the file.
6060

0 commit comments

Comments
 (0)