Merge pull request #1859 from petk/patch-images-1

Add image captions in Rerere section

Author: ben

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

@@ -38,7 +38,8 @@ end
 
 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[]
+.Two branches changing the same part of the same file differently
+image::images/rerere1.png[Two branches changing the same part of the same file differently]
 
 When we merge the two branches together, we'll get a merge conflict:
 
@@ -143,7 +144,8 @@ Recorded resolution for 'hello.rb'.
 
 You can see that it "Recorded resolution for FILE".
 
-image::images/rerere2.png[]
+.Recorded resolution for FILE
+image::images/rerere2.png[Recorded resolution for FILE]
 
 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 `git reset` as we saw in <<ch07-git-tools#_git_reset>>.
@@ -205,7 +207,8 @@ index a440db6,54336ba..0000000
   end
 ----
 
-image::images/rerere3.png[]
+.Automatically resolved merge conflict using previous resolution
+image::images/rerere3.png[Automatically resolved merge conflict using previous resolution]
 
 You can also recreate the conflicted file state with `git checkout`: