Skip to content
Merged
Changes from all commits
Commits
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/02-git-basics/sections/recording-changes.asc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ At this point, you should have a _bona fide_ Git repository on your local machin
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.

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

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.
Expand Down Expand Up @@ -54,7 +54,7 @@ nothing added to commit but untracked files present (use "git add" to track)
----

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); Git won't start including it in your commit snapshots until you explicitly tell it to do so.
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.
It does this so you don't accidentally begin including generated binary files or other files that you did not mean to include.
You do want to start including `README`, so let's start tracking the file.

Expand Down