Merge pull request #398 from crd/fix-console-blocks-in-07-git-tools

Fix console blocks in 07-git-tools

Author: ben

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

@@ -139,7 +139,7 @@ password=s3cre7
 
 Here's what the `~/git.store` file looks like:
 
-[source]
+[source,ini]
 ----
 https://bob:s3cre7@mygithost
 ----

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

@@ -25,9 +25,9 @@ $ 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, similar to our previous one.
-Let's say we have a file that looks like this:
+Let's say we have a file named `hello.rb` that looks like this:
 
-[source,console]
+[source,ruby]
 ----
 #! /usr/bin/env ruby
 
@@ -177,9 +177,8 @@ Patch failed at 0001 i18n one word
 Now, we got the same merge conflict like we expected, but take a look at the `Resolved FILE using previous resolution` line.
 If we look at the file, we'll see that it's already been resolved, there are no merge conflict markers in it.
 
-[source,console]
+[source,ruby]
 ----
-$ cat hello.rb
 #! /usr/bin/env ruby
 
 def hello

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

@@ -259,7 +259,6 @@ image::images/reset-squash-r3.png[]
 Now you can see that your reachable history, the history you would push, now looks like you had one commit with `file-a.txt` v1, then a second that both modified `file-a.txt` to v3 and added `file-b.txt`.
 The commit with the v2 version of the file is no longer in the history.
 
-
 ==== Check It Out
 
 Finally, you may wonder what the difference between `checkout` and `reset` is.

book/07-git-tools/sections/rewriting-history.asc

@@ -153,7 +153,6 @@ pick a5f4a0d added cat-file
 
 to this:
 
-
 [source,console]
 ----
 pick 310154e updated README formatting and added blame

book/07-git-tools/sections/stashing-cleaning.asc

@@ -182,7 +182,6 @@ Stash this hunk [y,n,q,a,d,/,e,?]? y
 Saved working directory and index state WIP on master: 1b65b17 added the index file
 ----
 
-
 ==== Creating a Branch from a Stash
 
 If you stash some work, leave it there for a while, and continue on the branch from which you stashed the work, you may have a problem reapplying the work.

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

@@ -57,9 +57,8 @@ Changes to be committed:
 First you should notice the new `.gitmodules` file.
 This is a configuration file that stores the mapping between the project’s URL and the local subdirectory you’ve pulled it into:
 
-[source,console]
+[source,ini]
 ----
-$ cat .gitmodules
 [submodule "DbConnector"]
 	path = DbConnector
 	url = https://github.com/chaconinc/DbConnector
@@ -689,7 +688,6 @@ $ git commit -am 'Fast forwarded to a common submodule child'
 
 This accomplishes the same thing, but at least this way you can verify that it works and you have the code in your submodule directory when you're done.
 
-
 ==== Submodule Tips
 
 There are a few things you can do to make working with submodules a little easier.