diff options
| author | Moayad Mardini <moayad.m@gmail.com> | 2014-05-24 20:31:34 +0300 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-05-25 19:34:20 -0400 |
| commit | e98d303562a50c57b55bbe2d4ebdec76f6624770 (patch) | |
| tree | de4867487c5aeb5dfb05a1aea3ef089c6ae3cc37 /docs | |
| parent | 83f4e865956e6527b4155ae03e313b36ccbe274f (diff) | |
Fixed #22692 -- Added docs for `makemigrations` two command options.
Added documentation about `--dry-run` and `--merge`.
Diffstat (limited to 'docs')
| -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 fe1d8dbc38..d3c3177858 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -660,6 +660,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>]] --------------------------------------- |