small changes

Author: schacon

book/03-git-branching/1-git-branching.asc

@@ -137,6 +137,12 @@ It moved the HEAD pointer back to point to the master branch, and it reverted th
 This also means the changes you make from this point forward will diverge from an older version of the project.
 It essentially rewinds the work you've done in your testing branch so you can go in a different direction.
 
+[NOTE]
+.Switching branches changes files in your working directory
+====
+It's important to note that when you switch branches in Git, files in your working directory will change. If you switch to an older branch, your working directory will be reverted to look like it did the last time you committed on that branch. If Git cannot do it cleanly, it will not let you switch at all.
+====
+
 Let's make a few changes and commit again:
 
 [source,shell]
@@ -158,12 +164,12 @@ You can also see this easily with the `git log` command. If you run `git log --o
 [source,shell]
 ----
 $ git log --oneline --decorate --graph --all
-* e6a539b (HEAD, master) made other changes
-| * a41d33e (testing) made a change
+* c2b9e (HEAD, master) made other changes
+| * 87ab2 (testing) made a change
 |/
-* b1d18f0 add feature #32 - ability to add new formats to the central library
-* 9eb453a fixed bug #1328 - stack overflow under certain conditions
-* b8a510a initial commit of my project
+* f30ab add feature #32 - ability to add new formats to the central library
+* 34ac2 fixed bug #1328 - stack overflow under certain conditions
+* 98ca9 initial commit of my project
 ----
 
 Because a branch in Git is in actuality a simple file that contains the 40 character SHA-1 checksum of the commit it points to, branches are cheap to create and destroy.
@@ -238,7 +244,7 @@ All you have to do is switch back to your `master` branch.
 
 However, before you do that, note that if your working directory or staging area has uncommitted changes that conflict with the branch you're checking out, Git won't let you switch branches.
 It's best to have a clean working state when you switch branches.
-There are ways to get around this (namely, stashing and commit amending) that we'll cover later.
+There are ways to get around this (namely, stashing and commit amending) that we'll cover <<_git_stashing, later>>.
 For now, let's assume you've committed all your changes, so you can switch back to your master branch:
 
 [source,shell]
@@ -248,15 +254,15 @@ Switched to branch 'master'
 ----
 
 At this point, your project working directory is exactly the way it was before you started working on issue #53, and you can concentrate on your hotfix.
-This is an important point to remember: Git resets your working directory to look like the snapshot of the commit that the branch your checkout points to.
+This is an important point to remember: when you switch branches, Git resets your working directory to look like it did the last time you committed on that branch.
 It adds, removes, and modifies files automatically to make sure your working copy is what the branch looked like on your last commit to it.
 
 Next, you have a hotfix to make.
 Let's create a hotfix branch on which to work until it's completed:
 
 [source,shell]
 ----
-$ git checkout -b 'hotfix'
+$ git checkout -b hotfix
 Switched to a new branch 'hotfix'
 $ vim index.html
 $ git commit -a -m 'fixed the broken email address'
@@ -281,7 +287,7 @@ Fast-forward
 ----
 
 You'll notice the phrase ``fast-forward'' in that merge.
-Because the commit pointed to by the branch you merged in was directly upstream of the commit you're on, Git moves the pointer forward.
+Because the commit pointed to by the branch you merged in was directly upstream of the commit you're on, Git simply moves the pointer forward.
 To phrase that another way, when you try to merge one commit with a commit that can be reached by following the first commit's history, Git simplifies things by moving the pointer forward because there is no divergent work to merge together – this is called a ``fast-forward.''
 
 Your change is now in the snapshot of the commit pointed to by the `master` branch, and you can deploy the fix.