test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.7.x] Fixed #22692 -- Added docs for `makemigrations` two command options. 

Added documentation about `--dry-run` and `--merge`.

Backport of e98d303562 from master
This commit is contained in:
Moayad Mardini 2014-05-24 20:31:34 +03:00 committed by Tim Graham
parent 22d33d52cb
commit 4d4ea65418
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

@ -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 the migration format, migration operations, and the dependencies between
your migrations. 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>]] migrate [<app_label> [<migrationname>]]
--------------------------------------- ---------------------------------------