diff options
| author | Marten Kenbeek <marten.knbk@gmail.com> | 2015-03-07 13:53:13 +0100 |
|---|---|---|
| committer | Markus Holtermann <info@markusholtermann.eu> | 2015-03-08 19:44:14 +0100 |
| commit | e272904ff7cc4d138e316ba2e7811666053860a4 (patch) | |
| tree | 8b2a8671da3e88b12196bd9b196d5b9f53270e90 /docs/ref/django-admin.txt | |
| parent | 794c3f74c32062d0f2ad021cb2af0e530b40730d (diff) | |
Fixed #23407 -- Extended coverage of makemigrations --noinput option.
Changed --noinput option in makemigrations to suppress all user prompts,
not just when combined with --merge.
Diffstat (limited to 'docs/ref/django-admin.txt')
| -rw-r--r-- | docs/ref/django-admin.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 4d969889d5..a354bdb045 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -649,6 +649,11 @@ Providing one or more app names as arguments will limit the migrations created to the app(s) specified and any dependencies needed (the table at the other end of a ``ForeignKey``, for example). +.. versionchanged:: 1.9 + +The ``--noinput`` option may be provided to suppress all user prompts. If a suppressed +prompt cannot be resolved automatically, the command will exit with error code 3. + .. django-admin-option:: --empty The ``--empty`` option will cause ``makemigrations`` to output an empty @@ -666,9 +671,7 @@ written. .. django-admin-option:: --merge -The ``--merge`` option enables fixing of migration conflicts. The -:djadminopt:`--noinput` option may be provided to suppress user prompts during -a merge. +The ``--merge`` option enables fixing of migration conflicts. .. django-admin-option:: --name, -n |