p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #22692 -- Added docs for `makemigrations` two command options. 

Added documentation about `--dry-run` and `--merge`.
This commit is contained in:
Moayad Mardini 2014-05-24 20:31:34 +03:00 committed by Tim Graham
parent 83f4e86595
commit e98d303562
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/ref/django-admin.txt
View File

@ -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>]]
---------------------------------------