Skip to content

Commit 9538178

Browse files
authored
Merge pull request #1132 from rpjday/ch2
chapter 2: minor clarification and punctuation fix
2 parents 52e813f + b3d7f27 commit 9538178

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Your branch is up-to-date with 'origin/master'.
3030
nothing to commit, working directory clean
3131
----
3232

33-
This means you have a clean working directory -- in other words, none of your tracked files are modified.
33+
This means you have a clean working directory; in other words, none of your tracked files are modified.
3434
Git also doesn't see any untracked files, or they would be listed here.
3535
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.
3636
For now, that branch is always ``master'', which is the default; you won't worry about it here.
@@ -84,7 +84,7 @@ Changes to be committed:
8484
----
8585

8686
You can tell that it's staged because it's under the ``Changes to be committed'' heading.
87-
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.
87+
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.
8888
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)))
8989
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.
9090

book/02-git-basics/sections/viewing-history.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Date: Sat Mar 15 10:31:28 2008 -0700
3636
first commit
3737
----
3838

39-
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.
39+
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.
4040
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.
4141

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

227227
==== Limiting Log Output
228228

229-
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.
229+
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.
230230
You've seen one such option already -- the `-2` option, which displays only the last two commits.
231231
In fact, you can do `-<n>`, where `n` is any integer to show the last `n` commits.
232232
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.

0 commit comments

Comments
 (0)