final backported errata

Author: schacon

book/01-introduction/1-introduction.asc

@@ -2,8 +2,8 @@
 == Getting Started
 
 This chapter will be about getting started with Git.
-We will begin at the beginning by explaining some background on version control tools, then move on to how to get Git running on your system and finally how to get it setup to start working with.
-At the end of this chapter you should understand why Git is around, why you should use it and you should be all setup to do so.
+We will begin by explaining some background on version control tools, then move on to how to get Git running on your system and finally how to get it set up to start working with.
+At the end of this chapter you should understand why Git is around, why you should use it and you should be all set up to do so.
 
 include::sections/about-version-control.asc[]
 

book/01-introduction/sections/basics.asc

@@ -84,8 +84,8 @@ Staged means that you have marked a modified file in its current version to go i
 
 This leads us to the three main sections of a Git project: the Git directory, the working directory, and the staging area.
 
-.Working directory, staging area, and git directory.
-image::images/areas.png[Working directory, staging area, and git directory.]
+.Working directory, staging area, and Git directory.
+image::images/areas.png[Working directory, staging area, and Git directory.]
 
 The Git directory is where Git stores the metadata and object database for your project.
 This is the most important part of Git, and it is what is copied when you clone a repository from another computer.

book/05-distributed-git/sections/contributing.asc

@@ -249,7 +249,7 @@ First, she switches back to her master branch to integrate all this work:
 [source,console]
 -----
 $ git checkout master
-Switched to branch "master"
+Switched to branch 'master'
 Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
 -----
 
@@ -325,7 +325,7 @@ She creates a new branch for the feature and does some work on it there:
 -----
 # Jessica's Machine
 $ git checkout -b featureA
-Switched to a new branch "featureA"
+Switched to a new branch 'featureA'
 $ vim lib/simplegit.rb
 $ git commit -am 'add limit to log function'
 [featureA 3300904] add limit to log function
@@ -440,7 +440,7 @@ Finally, she merges John's work into her own `featureA` branch:
 [source,console]
 -----
 $ git checkout featureA
-Switched to branch "featureA"
+Switched to branch 'featureA'
 $ git merge origin/featureA
 Updating 3300904..aad881d
 Fast forward

book/07-git-tools/sections/revision-selection.asc

@@ -116,13 +116,13 @@ You can see your reflog by using `git reflog`:
 [source,console]
 ----
 $ git reflog
-734713b... HEAD@{0}: commit: fixed refs handling, added gc auto, updated
-d921970... HEAD@{1}: merge phedders/rdocs: Merge made by recursive.
-1c002dd... HEAD@{2}: commit: added some blame and merge stuff
-1c36188... HEAD@{3}: rebase -i (squash): updating HEAD
-95df984... HEAD@{4}: commit: # This is a combination of two commits.
-1c36188... HEAD@{5}: rebase -i (squash): updating HEAD
-7e05da5... HEAD@{6}: rebase -i (pick): updating HEAD
+734713b HEAD@{0}: commit: fixed refs handling, added gc auto, updated
+d921970 HEAD@{1}: merge phedders/rdocs: Merge made by recursive.
+1c002dd HEAD@{2}: commit: added some blame and merge stuff
+1c36188 HEAD@{3}: rebase -i (squash): updating HEAD
+95df984 HEAD@{4}: commit: # This is a combination of two commits.
+1c36188 HEAD@{5}: rebase -i (squash): updating HEAD
+7e05da5 HEAD@{6}: rebase -i (pick): updating HEAD
 ----
 
 Every time your branch tip is updated for any reason, Git stores that information for you in this temporary history.

book/07-git-tools/sections/rewriting-history.asc

@@ -109,7 +109,7 @@ When you save and exit the editor, Git rewinds you back to the last commit in th
 [source,console]
 ----
 $ git rebase -i HEAD~3
-Stopped at 7482e0d... updated the gemspec to hopefully work better
+Stopped at f7f3f6d... changed my name a bit
 You can amend the commit now, with
 
        git commit --amend
@@ -174,12 +174,19 @@ The script puts helpful instructions in the rebase message:
 #
 # Commands:
 #  p, pick = use commit
+#  r, reword = use commit, but edit the commit message
 #  e, edit = use commit, but stop for amending
 #  s, squash = use commit, but meld into previous commit
+#  f, fixup = like "squash", but discard this commit's log message
+#  x, exec = run command (the rest of the line) using shell
+#
+# These lines can be re-ordered; they are executed from top to bottom.
 #
 # If you remove a line here THAT COMMIT WILL BE LOST.
+#
 # However, if you remove everything, the rebase will be aborted.
 #
+# Note that empty commits are commented out
 ----
 
 If, instead of ``pick'' or ``edit'', you specify ``squash'', Git applies both that change and the change directly before it and makes you merge the commit messages together.

book/07-git-tools/sections/stashing-cleaning.asc

@@ -45,7 +45,7 @@ Your working directory is clean:
 ----
 $ git status
 # On branch master
-nothing to commit (working directory clean)
+nothing to commit, working directory clean
 ----
 
 At this point, you can easily switch branches and do work elsewhere; your changes are stored on your stack.
@@ -55,8 +55,8 @@ To see which stashes you’ve stored, you can use `git stash list`:
 ----
 $ git stash list
 stash@{0}: WIP on master: 049d078 added the index file
-stash@{1}: WIP on master: c264051... Revert "added file_size"
-stash@{2}: WIP on master: 21d80a5... added number to log
+stash@{1}: WIP on master: c264051 Revert "added file_size"
+stash@{2}: WIP on master: 21d80a5 added number to log
 ----
 
 In this case, two stashes were done previously, so you have access to three different stashed works.
@@ -108,8 +108,8 @@ To remove it, you can run `git stash drop` with the name of the stash to remove:
 ----
 $ git stash list
 stash@{0}: WIP on master: 049d078 added the index file
-stash@{1}: WIP on master: c264051... Revert "added file_size"
-stash@{2}: WIP on master: 21d80a5... added number to log
+stash@{1}: WIP on master: c264051 Revert "added file_size"
+stash@{2}: WIP on master: 21d80a5 added number to log
 $ git stash drop stash@{0}
 Dropped stash@{0} (364e91f3f268f0900bc3ee613f9f733e82aaed43)
 ----
@@ -179,34 +179,6 @@ Saved working directory and index state WIP on master: 1b65b17 added the index f
 ----
 
 
-==== Un-applying a Stash
-
-In some use case scenarios you might want to apply stashed changes, do some work, but then un-apply those changes that originally came from the stash.
-Git does not provide such a `stash unapply` command, but it is possible to achieve the effect by simply retrieving the patch associated with a stash and applying it in reverse:
-
-[source,console]
-----
-$ git stash show -p stash@{0} | git apply -R
-----
-
-Again, if you don’t specify a stash, Git assumes the most recent stash:
-
-[source,console]
-----
-$ git stash show -p | git apply -R
-----
-
-You may want to create an alias and effectively add a `stash-unapply` command to your git.
-For example:
-
-[source,console]
-----
-$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
-$ git stash
-$ #... work work work
-$ git stash-unapply
-----
-
 ==== Creating a Branch from a Stash
 
 If you stash some work, leave it there for a while, and continue on the branch from which you stashed the work, you may have a problem reapplying the work.

book/08-customizing-git/sections/attributes.asc

@@ -314,6 +314,13 @@ You can set up an attribute like this:
 database.xml merge=ours
 ----
 
+[source,console]
+----
+And then define a dummy `ours` merge strategy with:
+----
+
+$ git config --global merge.ours.driver true
+
 If you merge in the other branch, instead of having merge conflicts with the `database.xml` file, you see something like this:
 
 [source,console]