Skip to content

Commit

Permalink
Fix more errata.
Browse files Browse the repository at this point in the history
  • Loading branch information
MikeMcQuaid committed Mar 17, 2016
1 parent 96d4bbd commit 0add926
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion 03-FilesystemInteractions.adoc
Expand Up @@ -239,7 +239,7 @@ From the add output:
* "ignored file (1)" `GitInPractiseGoodIdeas.tmp` wasn't added, as its addition would contradict your `.gitignore` rules.
* "error message (2)" was printed, as no files were added.
This interaction between `.gitignore` and `git add` is particularly useful when adding subdirectories of files and directories which may contain files that should to be ignored. `git add` won't add these files but will still successfully add all other that shouldn't be ignored.
This interaction between `.gitignore` and `git add` is particularly useful when adding subdirectories of files and directories which may contain files that should be ignored. `git add` won't add these files but will still successfully add all other that shouldn't be ignored.
### Delete ignored files
When files have been successfully ignored by the addition of a `.gitignore` file, you'll sometimes want to delete them all.
Expand Down
2 changes: 1 addition & 1 deletion 04-HistoryVisualization.adoc
Expand Up @@ -97,7 +97,7 @@ index ebb69c3..0000000

From the `show commit` output:

* "commit information (1)" shows all the same information expected in `git log output`, but only ever shows a single commit.
* "commit information (1)" shows all the same information expected in `git log` output, but only ever shows a single commit.
* "commit diff (2)" shows the changes that were made in that commit. It's the equivalent of typing `git diff HEAD^^..HEAD^`--the difference between the previous commit and the one before it.

The `git show HEAD^` output is equivalent to `git log --max-count=1 --patch HEAD^`.
Expand Down

0 comments on commit 0add926

Please sign in to comment.