innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.11.x] Removed inappropriate highlighting in committing-code.txt. 

Backport of 6d7cbe67f0 from master
This commit is contained in:
Markus Holtermann 2017-04-20 17:32:56 +02:00 committed by Tim Graham
parent 2f358d32ec
commit 0d9e7e9a26
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/internals/contributing/committing-code.txt
View File

@ -131,7 +131,9 @@ Django's Git repository:
The commit message should be in lines of 72 chars maximum. There should be The commit message should be in lines of 72 chars maximum. There should be
a subject line, separated by a blank line and then paragraphs of 72 char a subject line, separated by a blank line and then paragraphs of 72 char
lines. The limits are soft. For the subject line, shorter is better. In the lines. The limits are soft. For the subject line, shorter is better. In the
body of the commit message more detail is better than less:: body of the commit message more detail is better than less:
.. code-block:: none
Fixed #18307 -- Added git workflow guidelines Fixed #18307 -- Added git workflow guidelines
@ -183,13 +185,17 @@ Django's Git repository:
is the number of the ticket your commit references. This will automatically is the number of the ticket your commit references. This will automatically
post a comment to the appropriate ticket. post a comment to the appropriate ticket.
* Write commit messages for backports using this pattern:: * Write commit messages for backports using this pattern:
.. code-block:: none
[<Django version>] Fixed <ticket> -- <description> [<Django version>] Fixed <ticket> -- <description>
Backport of <revision> from <branch>. Backport of <revision> from <branch>.
For example:: For example:
.. code-block:: none
[1.3.x] Fixed #17028 -- Changed diveintopython.org -> diveintopython.net. [1.3.x] Fixed #17028 -- Changed diveintopython.org -> diveintopython.net.