Merge pull request #54 from Gumnos/master

Mostly cosmetic/grammar tweaks - Thanks for the fixes

afterhours2.tex

@@ -124,7 +124,7 @@ \subsection{A Look At Plumbing}
 The line we are interested in is listed below.
 
 \begin{code}
-./cf/e23cbe0150fda69a004e301828097935ec4397}
+./cf/e23cbe0150fda69a004e301828097935ec4397
 \end{code}
 
 It would be nice if we could find out a little more about this object, and confirm that it is what we expect it to be.

chap1.tex

@@ -114,7 +114,7 @@ \subsection{Version Control Nuances}
 \index{Staging}\subsection{Staging}
 Git deals with committing changes into the repository differently to most other version control systems by the introduction of the staging area.
 The staging area allows developers to prepare their commits before they are written to the repository.
-Why is this useful or any different to any other version control system.
+Why is this useful or any different from any other version control system?
 In Git you can make a change to a file, add it to the staging area, and then continue to make changes to that file, even though you have not yet actually committed anything.
 It should be noted that it's not absolutely necessary to use the staging area, but it is there for developers wishing to utilise it.
 

chap7.tex

@@ -317,7 +317,7 @@ \subsection{Rebase examples}
 ``What's up?'' said Martha over the cubicle wall.
 She stood up, knocking a pile of papers over that were hanging precariously on the edge of the desk.
 They scattered across the floor creating a white dividing line down the middle of the office.
-She mutter something under her breath.
+She mutters something under her breath.
 John and Simon began to help tidy the papers up whilst Simon started stating his problem.
 
 ``Well, I commit two commits that used the same commit message, I really wasn't thinking. Plus the fact that they should really have been one commit.''
@@ -620,7 +620,7 @@ \subsection{Using rebase with branches}
 \figuregith{11cm}{images/f-w7-d6.pdf}{Our repository after the rebase}
 
 \index{dangling}The grey commits are no longer referenced.
-No branche HEADs point to them, and no other commits rely upon them.
+No branch HEADs point to them, and no other commits rely upon them.
 In short they have been orphaned, or are left \index{dangling}\emph{dangling}.
 A dangling commit has no references left pointing to it.
 Remember each commit relies on its parent.
@@ -826,7 +826,7 @@ \subsection{Commands}
 \item\texttt{git rebase -i HEAD~3} - Runs the rebase tool interactively for the last three commits
 \item\texttt{git rebase <branchA> <branchB>} - Lift all commits between the common ancestor of branchA and branchB and replay them on top of branchB
 \item\texttt{git branch <branch\_name> <startpoint>} - Create a new branch starting from a definte start point
-\item\texttt{git rebase --onto master <branchC> \newline <branchA> <branchB>} - Lift all commits between the common ancestor of branchA and branchB and replay them on top of branchC
+\item\texttt{git rebase --onto <branchC> \newline <branchA> <branchB>} - Lift all commits between the common ancestor of branchA and branchB and replay them on top of branchC
 \end{itemize}
 
 \subsection{Terminology}

chap8.tex

@@ -850,7 +850,7 @@ \subsection{Splitting the atom}
 He idly stabbed at his leg with a pen whilst waiting for John to finish his tapping away.
 
 John lifted his keys from the keyboard and turned his chair.
-``You really can't think of a way to coopy what we have in one repo into another?''
+``You really can't think of a way to copy what we have in one repo into another?''
 
 Suddenly it was like a light bulb had exploded with light inside Jack's skull.  "CLONES!" he shouted.
 \end{trenches}