From b3d7f271c8486133c3da7c17c3fa72af66b6d070 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Sat, 24 Nov 2018 15:36:28 -0500 Subject: [PATCH] chapter 2: minor clarification and punctuation fix Signed-off-by: Robert P. J. Day --- book/02-git-basics/sections/recording-changes.asc | 4 ++-- book/02-git-basics/sections/viewing-history.asc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/book/02-git-basics/sections/recording-changes.asc b/book/02-git-basics/sections/recording-changes.asc index a778c9225..82b101892 100644 --- a/book/02-git-basics/sections/recording-changes.asc +++ b/book/02-git-basics/sections/recording-changes.asc @@ -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. @@ -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 ` -- 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. diff --git a/book/02-git-basics/sections/viewing-history.asc b/book/02-git-basics/sections/viewing-history.asc index 8c5be5e49..a52df6e56 100644 --- a/book/02-git-basics/sections/viewing-history.asc +++ b/book/02-git-basics/sections/viewing-history.asc @@ -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. @@ -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 `-`, 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.