From ca984aa50a4ac9278c8828c8fa178e678baa77a1 Mon Sep 17 00:00:00 2001
From: Timo Graham <timograham@gmail.com>
Date: Fri, 30 Dec 2011 12:52:49 +0000
Subject: [PATCH] Fixed #17334 - Documented the commit message style for
 backports; thanks krzysiumed for the draft patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/internals/contributing/committing-code.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt
index e33269be4d025..0d223a2263fb0 100644
--- a/docs/internals/contributing/committing-code.txt
+++ b/docs/internals/contributing/committing-code.txt
@@ -91,6 +91,18 @@ repository:
   Subversion and Trac so that any commit message in that format will
   automatically post a comment to the appropriate ticket.
 
+* Write commit messages for backports using this pattern::
+
+    [<Django version>] Fixed <ticket> -- <description>
+
+    Backport of <revision> from <branch>.
+
+  For example::
+
+    [1.3.X] Fixed #17028 - Changed diveintopython.org -> diveintopython.net.
+
+    Backport of r17115 from trunk.
+
 Reverting commits
 -----------------