diff options
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/django-admin.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 990f07bd6d..204d63c519 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -650,6 +650,15 @@ for advanced users and should not be used unless you are familiar with the migration format, migration operations, and the dependencies between your migrations. +.. django-admin-option:: --dry-run + +The ``--dry-run`` option shows what migrations would be made without +actually writing any migrations files to disk. + +.. django-admin-option:: --merge + +The ``--merge`` option enables fixing of migration conflicts. + migrate [<app_label> [<migrationname>]] --------------------------------------- |