summaryrefslogtreecommitdiff
path: root/docs/internals/contributing/committing-code.txt
diff options
context:
space:
mode:
authorTimo Graham <timograham@gmail.com>2011-12-30 12:52:49 +0000
committerTimo Graham <timograham@gmail.com>2011-12-30 12:52:49 +0000
commitca984aa50a4ac9278c8828c8fa178e678baa77a1 (patch)
tree72ff27c7434085bd12874746059dd038018c1858 /docs/internals/contributing/committing-code.txt
parent5e75678c8b7d3cc54aa27b7b682561c5fee64c6c (diff)
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
Diffstat (limited to 'docs/internals/contributing/committing-code.txt')
-rw-r--r--docs/internals/contributing/committing-code.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt
index e33269be4d..0d223a2263 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
-----------------