From 4d4ea654187c2cfecbcdfe3d67badcc50786ef25 Mon Sep 17 00:00:00 2001
From: Moayad Mardini <moayad.m@gmail.com>
Date: Sat, 24 May 2014 20:31:34 +0300
Subject: [PATCH] [1.7.x] Fixed #22692 -- Added docs for `makemigrations` two
 command options.

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

Backport of e98d303562 from master
---
 docs/ref/django-admin.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

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