diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/django-admin.txt | 7 | ||||
| -rw-r--r-- | docs/releases/2.0.txt | 3 | ||||
| -rw-r--r-- | docs/topics/migrations.txt | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 20e1bb02de..3a83bd2b7d 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -1132,6 +1132,13 @@ behavior, as optimization is meant to be safe. Suppresses all user prompts. +.. django-admin-option:: --squashed-name SQUASHED_NAME + +.. versionadded:: 2.0 + +Sets the name of the squashed migration. When omitted, the name is based on the +first and last migration, with ``_squashed_`` in between. + ``startapp`` ------------ diff --git a/docs/releases/2.0.txt b/docs/releases/2.0.txt index 0757d834f9..36359e4979 100644 --- a/docs/releases/2.0.txt +++ b/docs/releases/2.0.txt @@ -219,7 +219,8 @@ Management Commands Migrations ~~~~~~~~~~ -* ... +* The new :option:`squashmigrations --squashed-name` option allows naming + the squashed migration. Models ~~~~~~ diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt index a2eae4ff3d..6f0e3b912e 100644 --- a/docs/topics/migrations.txt +++ b/docs/topics/migrations.txt @@ -605,6 +605,9 @@ work:: all instances of the codebase have applied the migrations you squashed, you can delete them. +Use the :option:`squashmigrations --squashed-name` option if you want to set +the name of the squashed migration rather than use an autogenerated one. + Note that model interdependencies in Django can get very complex, and squashing may result in migrations that do not run; either mis-optimized (in which case you can try again with ``--no-optimize``, though you should also report an issue), |