Merge pull request #483 from crd/typos

Fix a few noncontroversial typos/inconsistencies

Author: ben

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

@@ -217,7 +217,7 @@ The rules for the patterns you can put in the `.gitignore` file are as follows:
 *  You can negate a pattern by starting it with an exclamation point (`!`).
 
 Glob patterns are like simplified regular expressions that shells use.
-An asterisk (`*`) matches zero or more characters; `[abc]` matches any character inside the brackets (in this case a, b, or c); a question mark (`?`) matches a single character; and brackets enclosing characters separated by a hyphen(`[0-9]`) matches any character between them (in this case 0 through 9).
+An asterisk (`*`) matches zero or more characters; `[abc]` matches any character inside the brackets (in this case a, b, or c); a question mark (`?`) matches a single character; and brackets enclosing characters separated by a hyphen (`[0-9]`) matches any character between them (in this case 0 through 9).
 You can also use two asterisks to match nested directories; `a/**/z` would match `a/z`, `a/b/z`, `a/b/c/z`, and so on.
 
 Here is another example .gitignore file:
@@ -354,7 +354,7 @@ index 643e24f..87f08c8 100644
 +# test line
 ----
 
-and `git diff --cached` to see what you've staged so far (--staged and --cached are synonyms):
+and `git diff --cached` to see what you've staged so far (`--staged` and `--cached` are synonyms):
 
 [source,console]
 ----
@@ -425,7 +425,7 @@ You can remove these comments and type your commit message, or you can leave the
 Doing so also puts the diff of your change in the editor so you can see exactly what changes you're committing.)
 When you exit the editor, Git creates your commit with that commit message (with the comments and diff stripped out).
 
-Alternatively, you can type your commit message inline with the `commit` command by specifying it after a -m flag, like this:
+Alternatively, you can type your commit message inline with the `commit` command by specifying it after a `-m` flag, like this:
 
 [source,console]
 ----
@@ -580,4 +580,4 @@ $ git add README
 
 Git figures out that it's a rename implicitly, so it doesn't matter if you rename a file that way or with the `mv` command.
 The only real difference is that `mv` is one command instead of three – it's a convenience function.
-More important, you can use any tool you like to rename a file, and address the add/rm later, before you commit.
+More importantly, you can use any tool you like to rename a file, and address the add/rm later, before you commit.

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

@@ -185,7 +185,7 @@ The author is the person who originally wrote the work, whereas the committer is
 So, if you send in a patch to a project and one of the core members applies the patch, both of you get credit – you as the author, and the core member as the committer.
 We'll cover this distinction a bit more in <<_distributed_git>>.
 
-The oneline and format options are particularly useful with another `log` option called `--graph`.
+The `oneline` and `format` options are particularly useful with another `log` option called `--graph`.
 This option adds a nice little ASCII graph showing your branch and merge history:
 
 [source,console]

book/03-git-branching/sections/remote-branches.asc

@@ -201,7 +201,7 @@ Finally we can see that our `testing` branch is not tracking any remote branch.
 It's important to note that these numbers are only since the last time you fetched from each server.
 This command does not reach out to the servers, it's telling you about what it has cached from these servers locally.
 If you want totally up to date ahead and behind numbers, you'll need to fetch from all your remotes right before running this.
-You could do that like this: `$ git fetch --all; git branch -vv`
+You could do that like this: `git fetch --all; git branch -vv`
 
 ==== Pulling