Merge branch 'feature/blog-page' into develop

source/_posts/2014-05-21-git-format-patch.md

@@ -8,6 +8,11 @@ tags:
   - drupal-planet
   - git
 ---
+{% block excerpt %}
+An explanation of the "git format-patch" command, and how it could be used in Drupal's Git workflow.
+{% endblock %}
+
+{% block content %}
 ## The Problem
 
 As an active contributor to the [Drupal](http://drupal.org) project, I spend a lot of time working with other peoples’ modules and themes, and occassionally have to fix a bug or add some new functionality.
@@ -38,15 +43,13 @@ From the [manual page](http://git-scm.com/docs/git-format-patch):
 
 Here is a section of a patch that I created for the [Metatag module](http://drupal.org/project/metatag) using `git format-patch`:
 
-~~~
-From 80c8fa14de7f4a83c2e70367aab0aedcadf4f3b0 Mon Sep 17 00:00:00 2001
-From: Oliver Davies <oliver@oliverdavies.co.uk>
-Date: Mon, 12 May 2014 14:53:55 +0100
-Subject: [PATCH] Exclude comment entities when checking if this is the page,
- otherwise comment_fragment.module will break metatag
+    From 80c8fa14de7f4a83c2e70367aab0aedcadf4f3b0 Mon Sep 17 00:00:00 2001
+    From: Oliver Davies <oliver@oliverdavies.co.uk>
+    Date: Mon, 12 May 2014 14:53:55 +0100
+    Subject: [PATCH] Exclude comment entities when checking if this is the page,
+     otherwise comment_fragment.module will break metatag
 
----
-~~~
+    ---
 
 As mentioned above, the patch is structured in an email format. The commit message is used as the subject line, and the date that the commit was made locally is used for the date. What we’re interested in is the “From” value. This contains your name and email address from your `~/.gitconfig` file and is used to author the patch automatically.
 
@@ -80,13 +83,12 @@ For example, within your repository, run:
 
 You should end up with some output similar to the following:
 
-~~~
-Applying: #2272799 Added supporters section
-Applying: #2272799 Added navigation tabs
-Applying: #2272799 Fixed indentation
-Applying: #2272799 Replaced URL
-~~~
+    Applying: #2272799 Added supporters section
+    Applying: #2272799 Added navigation tabs
+    Applying: #2272799 Fixed indentation
+    Applying: #2272799 Replaced URL
 
 Each line is the commit message associated with that patch.
 
 Assuming that there are no errors, you can go ahead and push your updated code into your remote repository.
+{% endblock %}