summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/django-admin.txt8
-rw-r--r--docs/releases/1.8.txt3
2 files changed, 11 insertions, 0 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 07f7093634..85864d78b8 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -719,6 +719,14 @@ a merge.
The ``--name`` option allows you to give the migration(s) a custom name instead
of a generated one.
+.. django-admin-option:: --exit, -e
+
+.. versionadded:: 1.8
+
+The ``--exit`` option will cause ``makemigrations`` to exit with error code 1
+when no migration are created (or would have been created, if combined with
+``--dry-run``).
+
migrate [<app_label> [<migrationname>]]
---------------------------------------
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 5df0cc1bd1..8f4053168d 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -333,6 +333,9 @@ Management Commands
:setting:`FIXTURE_DIRS` contains duplicates or a default fixture directory
path (``app_name/fixtures``), an exception is raised.
+* :djadmin:`makemigrations` now supports an :djadminopt:`--exit` option to
+ exit with an error code if no migrations are created.
+
Middleware
^^^^^^^^^^