Skip to content

chapter 2: minor clarification and punctuation fix #1132

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
merged 1 commit into from
Nov 26, 2018
Merged

chapter 2: minor clarification and punctuation fix #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
----

This means you have a clean working directory -- in other words, none of your tracked files are modified.
This means you have a clean working directory; in other words, none of your tracked files are modified.
Git also doesn't see any untracked files, or they would be listed here.
Finally, the command tells you which branch you're on and informs you that it has not diverged from the same branch on the server.
For now, that branch is always ``master'', which is the default; you won't worry about it here.
Expand Down Expand Up @@ -84,7 +84,7 @@ Changes to be committed:
----

You can tell that it's staged because it's under the ``Changes to be committed'' heading.
If you commit at this point, the version of the file at the time you ran `git add` is what will be in the historical snapshot.
If you commit at this point, the version of the file at the time you ran `git add` is what will be in the subsequent historical snapshot.
You may recall that when you ran `git init` earlier, you then ran `git add <files>` -- that was to begin tracking files in your directory.(((git commands, init)))(((git commands, add)))
The `git add` command takes a path name for either a file or a directory; if it's a directory, the command adds all the files in that directory recursively.

Expand Down
4 changes: 2 additions & 2 deletions book/02-git-basics/sections/viewing-history.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Date: Sat Mar 15 10:31:28 2008 -0700
first commit
----

By default, with no arguments, `git log` lists the commits made in that repository in reverse chronological order -- that is, the most recent commits show up first.
By default, with no arguments, `git log` lists the commits made in that repository in reverse chronological order; that is, the most recent commits show up first.
As you can see, this command lists each commit with its SHA-1 checksum, the author's name and email, the date written, and the commit message.

A huge number and variety of options to the `git log` command are available to show you exactly what you're looking for.
Expand Down Expand Up @@ -226,7 +226,7 @@ Those are only some simple output-formatting options to `git log` -- there are m

==== Limiting Log Output

In addition to output-formatting options, `git log` takes a number of useful limiting options -- that is, options that let you show only a subset of commits.
In addition to output-formatting options, `git log` takes a number of useful limiting options; that is, options that let you show only a subset of commits.
You've seen one such option already -- the `-2` option, which displays only the last two commits.
In fact, you can do `-<n>`, where `n` is any integer to show the last `n` commits.
In reality, you're unlikely to use that often, because Git by default pipes all output through a pager so you see only one page of log output at a time.
Expand Down