Browse files

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

Added documentation about `--dry-run` and `--merge`.
  • Loading branch information...
1 parent 83f4e86 commit e98d303562a50c57b55bbe2d4ebdec76f6624770 @mmardini mmardini committed with timgraham May 24, 2014
Showing with 9 additions and 0 deletions.
  1. +9 −0 docs/ref/django-admin.txt
9 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>]]

0 comments on commit e98d303

Please sign in to comment.