summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRaffaele Salmaso <raffaele@salmaso.org>2014-08-19 15:24:31 +0200
committerTim Graham <timograham@gmail.com>2014-09-02 21:09:18 -0400
commit1435cfbe8dbd85c17c9a25af99f910c407dfa9bd (patch)
tree7b3902cec1c408336b6b908653fb02cecd2a47ee /docs
parentbda28097126c0ff77c51d598ccc19663bcd3ee95 (diff)
Fixed #23302 -- Added --name/-n option to makemigrations command
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/django-admin.txt7
-rw-r--r--docs/releases/1.8.txt3
-rw-r--r--[-rwxr-xr-x]docs/topics/migrations.txt7
3 files changed, 17 insertions, 0 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index fd80080f64..e91423ff6b 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -683,6 +683,13 @@ written.
The ``--merge`` option enables fixing of migration conflicts.
+.. django-admin-option:: --name, -n
+
+.. versionadded:: 1.8
+
+The ``--name`` option allows you to give the migration(s) a custom name instead
+of a generated one.
+
migrate [<app_label> [<migrationname>]]
---------------------------------------
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 8b1df14418..a95024420c 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -228,6 +228,9 @@ Management Commands
* The :djadmin:`dbshell` command now supports MySQL's optional SSL certificate
authority setting (``--ssl-ca``).
+* The :djadminopt:`--name` option for :djadmin:`makemigrations` allows you to
+ to give the migration(s) a custom name instead of a generated one.
+
Models
^^^^^^
diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt
index cd03a2f840..626790183b 100755..100644
--- a/docs/topics/migrations.txt
+++ b/docs/topics/migrations.txt
@@ -309,6 +309,13 @@ Note that this only works given two things:
that your database doesn't match your models, you'll just get errors when
migrations try to modify those tables.
+.. versionadded:: 1.8
+
+If you want to give the migration(s) a meaningful name instead of a generated one,
+you can use the :djadminopt:`--name` option::
+
+ $ python manage.py makemigrations --name changed_my_model your_app_label
+
.. _historical-models:
Historical models