summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/django-admin.txt7
-rw-r--r--docs/releases/4.2.txt3
2 files changed, 10 insertions, 0 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 25a1107c55..5016b25ea2 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -832,6 +832,13 @@ migrations are detected.
Diverts log output and input prompts to ``stderr``, writing only paths of
generated migration files to ``stdout``.
+.. django-admin-option:: --update
+
+.. versionadded:: 4.2
+
+Merges model changes into the latest migration and optimize the resulting
+operations.
+
``migrate``
-----------
diff --git a/docs/releases/4.2.txt b/docs/releases/4.2.txt
index 345f4d4ad8..d43d391408 100644
--- a/docs/releases/4.2.txt
+++ b/docs/releases/4.2.txt
@@ -158,6 +158,9 @@ Management Commands
* :djadmin:`makemessages` command now supports locales with private sub-tags
such as ``nl_NL-x-informal``.
+* The new :option:`makemigrations --update` option merges model changes into
+ the latest migration and optimizes the resulting operations.
+
Migrations
~~~~~~~~~~