Skip to content

Commit e412a41

Browse files
committed
Fix a few noncontroversial typos/inconsistencies
1 parent ee162f0 commit e412a41

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ The rules for the patterns you can put in the `.gitignore` file are as follows:
217217
* You can negate a pattern by starting it with an exclamation point (`!`).
218218

219219
Glob patterns are like simplified regular expressions that shells use.
220-
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).
220+
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).
221221
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.
222222

223223
Here is another example .gitignore file:
@@ -354,7 +354,7 @@ index 643e24f..87f08c8 100644
354354
+# test line
355355
----
356356

357-
and `git diff --cached` to see what you've staged so far (--staged and --cached are synonyms):
357+
and `git diff --cached` to see what you've staged so far (`--staged` and `--cached` are synonyms):
358358

359359
[source,console]
360360
----
@@ -425,7 +425,7 @@ You can remove these comments and type your commit message, or you can leave the
425425
Doing so also puts the diff of your change in the editor so you can see exactly what changes you're committing.)
426426
When you exit the editor, Git creates your commit with that commit message (with the comments and diff stripped out).
427427

428-
Alternatively, you can type your commit message inline with the `commit` command by specifying it after a -m flag, like this:
428+
Alternatively, you can type your commit message inline with the `commit` command by specifying it after a `-m` flag, like this:
429429

430430
[source,console]
431431
----
@@ -580,4 +580,4 @@ $ git add README
580580

581581
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.
582582
The only real difference is that `mv` is one command instead of three – it's a convenience function.
583-
More important, you can use any tool you like to rename a file, and address the add/rm later, before you commit.
583+
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ The author is the person who originally wrote the work, whereas the committer is
185185
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.
186186
We'll cover this distinction a bit more in <<_distributed_git>>.
187187

188-
The oneline and format options are particularly useful with another `log` option called `--graph`.
188+
The `oneline` and `format` options are particularly useful with another `log` option called `--graph`.
189189
This option adds a nice little ASCII graph showing your branch and merge history:
190190

191191
[source,console]

0 commit comments

Comments
 (0)