summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorMarkus Holtermann <info@markusholtermann.eu>2015-09-12 17:18:24 +1000
committerMarkus Holtermann <info@markusholtermann.eu>2015-09-19 14:55:34 +1000
commit43f2eb7ef327126271a8c70d6fde5713947150a5 (patch)
tree7ca77f515be7253a42cc952a2f9f4b57001988ca /docs/ref
parent5aa55038ca9ac44b440b56d1fc4e79c876e51393 (diff)
Fixed #25390 -- Allowed specifying a start migration in squashmigrations
Thanks Tim Graham for the review.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/django-admin.txt11
1 files changed, 9 insertions, 2 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 02ab4f0614..18e8ec1ca0 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -1049,8 +1049,8 @@ of sync with its automatically incremented field data.
The :djadminopt:`--database` option can be used to specify the database for
which to print the SQL.
-squashmigrations <app_label> <migration_name>
----------------------------------------------
+squashmigrations <app_label> [<start_migration_name>] <migration_name>
+----------------------------------------------------------------------
.. django-admin:: squashmigrations
@@ -1059,6 +1059,13 @@ down into fewer migrations, if possible. The resulting squashed migrations
can live alongside the unsquashed ones safely. For more information,
please read :ref:`migration-squashing`.
+.. versionadded:: 1.9
+
+When ``start_migration_name`` is given, Django will only include migrations
+starting from and including this migration. This helps to mitigate the
+squashing limitation of :class:`~django.db.migrations.operations.RunPython` and
+:class:`django.db.migrations.operations.RunSQL` migration operations.
+
.. django-admin-option:: --no-optimize
By default, Django will try to optimize the operations in your migrations