summaryrefslogtreecommitdiff
path: root/docs/internals/contributing/committing-code.txt
diff options
context:
space:
mode:
authorakki <akki@users.noreply.github.com>2016-11-16 03:30:50 +0530
committerTim Graham <timograham@gmail.com>2016-11-15 17:32:16 -0500
commitd2fc204694fa57a56da819b00a204a39eea55d82 (patch)
tree0cb600f58af809a8bc9eab7d14eb30cba9a514fb /docs/internals/contributing/committing-code.txt
parentaf0f01558bb53553a1a7cd24f8121163c0069c85 (diff)
[1.10.x] Replaced "django" with "Django" in spelling_wordlist.
Backport of 74ed20b49ade9f1cbd9af294e35478d8e0f59344 from master
Diffstat (limited to 'docs/internals/contributing/committing-code.txt')
-rw-r--r--docs/internals/contributing/committing-code.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt
index 1e53be41f5..5bd47e8f67 100644
--- a/docs/internals/contributing/committing-code.txt
+++ b/docs/internals/contributing/committing-code.txt
@@ -106,9 +106,9 @@ Committing guidelines
In addition, please follow the following guidelines when committing code to
Django's Git repository:
-* Never change the published history of django/django branches! **Never
- force-push your changes to django/django.** If you absolutely must (for
- security reasons for example) first discuss the situation with the core team.
+* Never change the published history of ``django/django`` branches by force
+ pushing. If you absolutely must (for security reasons for example), first
+ discuss the situation with the team.
* For any medium-to-big changes, where "medium-to-big" is according to
your judgment, please bring things up on the |django-developers|
@@ -239,7 +239,7 @@ When a mistaken commit is discovered, please follow these guidelines:
* The release branch maintainer may back out commits to the release
branch without permission if the commit breaks the release branch.
-* If you mistakenly push a topic branch to django/django, just delete it.
+* If you mistakenly push a topic branch to ``django/django``, just delete it.
For instance, if you did: ``git push upstream feature_antigravity``,
just do a reverse push: ``git push upstream :feature_antigravity``.