Browse files

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


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

Backport of e98d303 from master
  • Loading branch information...
1 parent 22d33d5 commit 4d4ea654187c2cfecbcdfe3d67badcc50786ef25 @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
@@ -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>]]

0 comments on commit 4d4ea65

Please sign in to comment.