Merge pull request #399 from crd/fix-console-blocks-in-08-customizing-git

Fix console blocks in 08-customizing.git

Author: ben

book/08-customizing-git/sections/attributes.asc

@@ -24,7 +24,7 @@ In essence, you want to treat it like a binary file.
 
 To tell Git to treat all `pbxproj` files as binary data, add the following line to your `.gitattributes` file:
 
-[source]
+[source,ini]
 ----
 *.pbxproj binary
 ----
@@ -53,7 +53,7 @@ You can't directly compare two versions unless you check them out and scan them
 It turns out you can do this fairly well using Git attributes.
 Put the following line in your `.gitattributes` file:
 
-[source]
+[source,ini]
 ----
 *.docx diff=word
 ----
@@ -121,7 +121,7 @@ $ git config diff.exif.textconv exiftool
 
 If you replace an image in your project and run `git diff`, you see something like this:
 
-[source]
+[source,diff]
 ----
 diff --git a/image.png b/image.png
 index 88839c4..4afcb7c 100644
@@ -193,7 +193,7 @@ image::images/clean.png[The ``clean'' filter is run when files are staged.]
 The original commit message for this feature gives a simple example of running all your C source code through the `indent` program before committing.
 You can set it up by setting the filter attribute in your `.gitattributes` file to filter `*.c` files with the ``indent'' filter:
 
-[source]
+[source,ini]
 ----
 *.c filter=indent
 ----
@@ -271,7 +271,7 @@ If there is a subdirectory or file that you don't want to include in your archiv
 For example, say you have some test files in a `test/` subdirectory, and it doesn't make sense to include them in the tarball export of your project.
 You can add the following line to your Git attributes file:
 
-[source]
+[source,ini]
 ----
 test/ export-ignore
 ----
@@ -304,7 +304,7 @@ Last commit date: Tue Apr 21 08:38:48 2009 -0700 by Scott Chacon
 
 The substitutions can include for example the commit message and any git notes, and git log can do simple word wrapping:
 
-[source.console]
+[source,console]
 ----
 $ echo '$Format:Last commit: %h by %aN at %cd%n%+w(76,6,9)%B$' > LAST_COMMIT
 $ git commit -am 'export-subst uses git log's custom formatter
@@ -333,7 +333,7 @@ This is helpful if a branch in your project has diverged or is specialized, but
 Say you have a database settings file called `database.xml` that is different in two branches, and you want to merge in your other branch without messing up the database file.
 You can set up an attribute like this:
 
-[source]
+[source,ini]
 ----
 database.xml merge=ours
 ----

book/08-customizing-git/sections/config.asc

@@ -66,7 +66,7 @@ Now, no matter what is set as your default shell editor, Git will fire up Emacs
 If you set this to the path of a file on your system, Git will use that file as the default message when you commit.
 For instance, suppose you create a template file at `~/.gitmessage.txt` that looks like this:
 
-[source]
+[source,text]
 ----
 subject line
 
@@ -85,7 +85,7 @@ $ git commit
 
 Then, your editor will open to something like this for your placeholder commit message when you commit:
 
-[source]
+[source,text]
 ----
 subject line
 
@@ -150,7 +150,7 @@ If your preferred editor is Emacs or Vim, you know about files that end with a `
 This setting lets you write a kind of global `.gitignore` file.
 If you create a `~/.gitignore_global` file with these contents:
 
-[source]
+[source,ini]
 ----
 *~
 .DS_Store
@@ -221,7 +221,10 @@ Each of these can be set to `true`, `false`, or `always`:
 In addition, each of these has subsettings you can use to set specific colors for parts of the output, if you want to override each color.
 For example, to set the meta information in your diff output to blue foreground, black background, and bold text, you can run
 
-  $ git config --global color.diff.meta "blue black bold"
+[source,console]
+----
+$ git config --global color.diff.meta "blue black bold"
+----
 
 You can set the color to any of the following values: `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan`, or `white`.
 If you want an attribute like bold in the previous example, you can choose from `bold`, `dim`, `ul` (underline), `blink`, and `reverse` (swap foreground and background).

book/08-customizing-git/sections/policy.asc

@@ -239,7 +239,7 @@ error: failed to push some refs to 'git@gitserver:project.git'
 There are a couple of interesting things here.
 First, you see this where the hook starts running.
 
-[source]
+[source,console]
 ----
 Enforcing Policies...
 (refs/heads/master) (fb8c72) (c56860)
@@ -250,7 +250,7 @@ Anything your script echoes to `stdout` will be transferred to the client.
 
 The next thing you'll notice is the error message.
 
-[source]
+[source,console]
 ----
 [POLICY] Your message is not formatted correctly
 error: hooks/update exited with error code 1
@@ -260,7 +260,7 @@ error: hook declined to update refs/heads/master
 The first line was printed out by you, the other two were Git telling you that the update script exited non-zero and that is what is declining your push.
 Lastly, you have this:
 
-[source]
+[source,console]
 ----
 To git@gitserver:project.git
  ! [remote rejected] master -> master (hook declined)
@@ -272,7 +272,7 @@ You'll see a remote rejected message for each reference that your hook declined,
 Furthermore, if someone tries to edit a file they don't have access to and push a commit containing it, they will see something similar.
 For instance, if a documentation author tries to push a commit modifying something in the `lib` directory, they see
 
-[source]
+[source,console]
 ----
 [POLICY] You do not have access to push to lib/test.rb
 ----