Minor tweaks/grammar/dashes/rewording to "Rerere".

Author: robertpjday

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

@@ -2,27 +2,27 @@
 === Rerere
 
 The `git rerere` functionality is a bit of a hidden feature.
-The name stands for ``reuse recorded resolution'' and as the name implies, it allows you to ask Git to remember how you've resolved a hunk conflict so that the next time it sees the same conflict, Git can automatically resolve it for you.
+The name stands for ``reuse recorded resolution'' and, as the name implies, it allows you to ask Git to remember how you've resolved a hunk conflict so that the next time it sees the same conflict, Git can resolve it for you automatically.
 
 There are a number of scenarios in which this functionality might be really handy.
-One of the examples that is mentioned in the documentation is if you want to make sure a long lived topic branch will merge cleanly but don't want to have a bunch of intermediate merge commits.
-With `rerere` turned on you can merge occasionally, resolve the conflicts, then back out the merge.
+One of the examples that is mentioned in the documentation is when you want to make sure a long-lived topic branch will ultimately merge cleanly, but you don't want to have a bunch of intermediate merge commits cluttering up your commit history.
+With `rerere` enabled, you can attempt the occasional merge, resolve the conflicts, then back out of the merge.
 If you do this continuously, then the final merge should be easy because `rerere` can just do everything for you automatically.
 
 This same tactic can be used if you want to keep a branch rebased so you don't have to deal with the same rebasing conflicts each time you do it.
-Or if you want to take a branch that you merged and fixed a bunch of conflicts and then decide to rebase it instead - you likely won't have to do all the same conflicts again.
+Or if you want to take a branch that you merged and fixed a bunch of conflicts and then decide to rebase it instead -- you likely won't have to do all the same conflicts again.
 
-Another situation is where you merge a bunch of evolving topic branches together into a testable head occasionally, as the Git project itself often does.
+Another application of `rerere` is where you merge a bunch of evolving topic branches together into a testable head occasionally, as the Git project itself often does.
 If the tests fail, you can rewind the merges and re-do them without the topic branch that made the tests fail without having to re-resolve the conflicts again.
 
-To enable the `rerere` functionality, you simply have to run this config setting:
+To enable `rerere` functionality, you simply have to run this config setting:
 
 [source,console]
 ----
 $ 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.
+You can also turn it on by creating the `.git/rr-cache` directory in a specific repository, but the config setting is clearer and enables that feature globally for you.
 
 Now let's see a simple example, similar to our previous one.
 Let's say we have a file named `hello.rb` that looks like this:
@@ -76,7 +76,7 @@ $ git rerere status
 hello.rb
 ----
 
-And `git rerere diff` will show the current state of the resolution - what you started with to resolve and what you've resolved it to.
+And `git rerere diff` will show the current state of the resolution -- what you started with to resolve and what you've resolved it to.
 
 [source,console]
 ----
@@ -99,7 +99,7 @@ $ git rerere diff
  end
 ----
 
-Also (and this isn't really related to `rerere`), you can use `ls-files -u` to see the conflicted files and the before, left and right versions:
+Also (and this isn't really related to `rerere`), you can use `git ls-files -u` to see the conflicted files and the before, left and right versions:
 
 [source,console]
 ----
@@ -109,7 +109,7 @@ $ git ls-files -u
 100644 54336ba847c3758ab604876419607e9443848474 3	hello.rb
 ----
 
-Now you can resolve it to just be `puts 'hola mundo'` and you can run the `rerere diff` command again to see what rerere will remember:
+Now you can resolve it to just be `puts 'hola mundo'` and you can run `git rerere diff` again to see what rerere will remember:
 
 [source,console]
 ----
@@ -146,7 +146,7 @@ You can see that it "Recorded resolution for FILE".
 image::images/rerere2.png[]
 
 Now, let's undo that merge and then rebase it on top of our master branch instead.
-We can move our branch back by using `reset` as we saw in <<_git_reset>>.
+We can move our branch back by using `git reset` as we saw in <<_git_reset>>.
 
 [source,console]
 ----
@@ -207,7 +207,7 @@ index a440db6,54336ba..0000000
 
 image::images/rerere3.png[]
 
-You can also recreate the conflicted file state with the `checkout` command:
+You can also recreate the conflicted file state with `git checkout`:
 
 [source,console]
 ----
@@ -225,7 +225,7 @@ end
 ----
 
 We saw an example of this in <<_advanced_merging>>.
-For now though, let's re-resolve it by just running `rerere` again:
+For now though, let's re-resolve it by just running `git rerere` again:
 
 [source,console]
 ----