git checkout appendix

Author: schacon

book/03-git-branching/sections/nutshell.asc

@@ -86,6 +86,7 @@ f30ab (HEAD, master, testing) add feature #32 - ability to add new
 
 You can see the ``master'' and ``testing'' branches that are right there next to the `f30ab` commit.
 
+[[_switching_branches]]
 ==== Switching branches
 
 (((branches, switching)))

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

@@ -596,7 +596,7 @@ You start a new branch based off the current `origin/master` branch, squash the
 (((git commands, merge, squash)))
 [source,shell]
 -----
-$ git checkout -b featureBv2 origin/master^{}
+$ git checkout -b featureBv2 origin/master
 $ git merge --no-commit --squash featureB
 # (change implementation)
 $ git commit

book/07-git-tools/sections/advanced-merging.asc

@@ -272,6 +272,7 @@ Removing hello.ours.rb
 Removing hello.theirs.rb
 ----
 
+[[_checking_out_conflicts]]
 ===== Checking Out Conflicts
 
 Perhaps we're not happy with the resolution at this point for some reason, or maybe manually editing one or both sides still didn't work well and we need more context.

book/10-git-internals/sections/refs.asc

@@ -66,6 +66,7 @@ image::images/data-model-4.png[Git directory objects with branch head references
 
 When you run commands like `git branch (branchname)`, Git basically runs that `update-ref` command to add the SHA-1 of the last commit of the branch you’re on into whatever new reference you want to create.
 
+[[_the_head]]
 ==== The HEAD
 
 The question now is, when you run `git branch (branchname)`, how does Git know the SHA-1 of the last commit?

book/C-git-commands/1-git-commands.asc

@@ -159,8 +159,20 @@ Finally, we go through some of what it does in the background in <<_git_refs>>.
 
 The `git checkout` command is used to switch branches and  check content out into your working directory.
 
+We first encounter the command in <<_switching_branches>> along with the `git branch` command.
+
+We see how to use it to start tracking branches with the `--track` flag in <<_tracking_branches>>.
+
+We use it to reintroduce file conflicts with `--conflict=diff3` in <<_checking_out_conflicts>>.
+
+We go into closer detail on it's relationship with `git reset` in <<_git_reset>>.
+
+Finally, we go into some implementation detail in <<_the_head>>.
+
 ==== git merge
 
+The `git merge` tool is used to merge one or more branches  into the branch you have checked out.
+
 ==== git mergetool
 
 ==== git log