a few more tweaks for consistency

Author: schacon

book/07-git-tools/sections/rerere.asc

@@ -18,7 +18,7 @@ $ git config --global rerere.enabled true
 
 You can also turn it on by creating the `.git/rr-cache` directory in a specific repository, but the config setting is clearer and it can be done globally.
 
-Now let's see a simple example. Let's say we have a file that looks like this:
+Now let's see a simple example, similar to our previous one. Let's say we have a file that looks like this:
 
 [source,shell]
 ----
@@ -29,7 +29,7 @@ def hello
 end
 ----
 
-In one branch we change the word ``hello'' to ``hola'', then in another branch we change the ``world'' to ``mundo''.
+In one branch we change the word ``hello'' to ``hola'', then in another branch we change the ``world'' to ``mundo'', just like before.
 
 image::images/rerere1.png[]
 

book/07-git-tools/sections/submodules.asc

@@ -1,3 +1,4 @@
+[[_git_submodules]]
 === Submodules
 
 It often happens that while working on one project, you need to use another project from within it.

book/07-git-tools/sections/subtree-merges.asc

@@ -79,7 +79,7 @@ Automatic merge went well; stopped before committing as requested
 All the changes from the Rack project are merged in and ready to be committed locally.
 You can also do the opposite – make changes in the `rack` subdirectory of your master branch and then merge them into your `rack_branch` branch later to submit them to the maintainers or push them upstream.
 
-This gives us a way to have a workflow somewhat similar to the submodule workflow without using submodules. We can keep branches with other related projects in our repository and subtree merge them into our project occasionally. It is nice in some ways, for example all the code is committed to a single place. However, it has other drawbacks in that it's a bit more complex and easier to make mistakes in reintegrating changes or accidentally pushing a branch into an unrelated repository.
+This gives us a way to have a workflow somewhat similar to the submodule workflow without using submodules (which we will cover in <<_git_submodules>>). We can keep branches with other related projects in our repository and subtree merge them into our project occasionally. It is nice in some ways, for example all the code is committed to a single place. However, it has other drawbacks in that it's a bit more complex and easier to make mistakes in reintegrating changes or accidentally pushing a branch into an unrelated repository.
 
 Another slightly weird thing is that to get a diff between what you have in your `rack` subdirectory and the code in your `rack_branch` branch – to see if you need to merge them – you can’t use the normal `diff` command.
 Instead, you must run `git diff-tree` with the branch you want to compare to: