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:37:11 -0400 |
| commit | 4d4ea654187c2cfecbcdfe3d67badcc50786ef25 (patch) | |
| tree | aa5404c713c72886f9f18ef7f584e299cbf1240b /docs | |
| parent | 22d33d52cbc840f4648a3809b893aec48409b29b (diff) | |
[1.7.x] Fixed #22692 -- Added docs for `makemigrations` two command options.
Added documentation about `--dry-run` and `--merge`.
Backport of e98d303562 from master
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 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>]] --------------------------------------- |