diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2017-03-08 08:54:17 +0000 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-05-27 09:00:06 -0400 |
| commit | 2f09a285582cb475a9d27067808d9beefa7f9fba (patch) | |
| tree | a53b600fa4f242dcb9626c12535b19bb50d46e37 /docs | |
| parent | af1fa5e7da21c57a4037e67f93493af4e78d454a (diff) | |
Fixed #27881 -- Added diffsettings --output option.
Thanks Haris Ibrahim K. V. for writng docs.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/django-admin.txt | 10 | ||||
| -rw-r--r-- | docs/releases/2.0.txt | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 68fb762623..7f120c28b3 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -240,6 +240,16 @@ are prefixed by ``"###"``. The settings module to compare the current settings against. Leave empty to compare against Django's default settings. +.. django-admin-option:: --output {hash,unified} + +.. versionadded:: 2.0 + +Specifies the output format. Available values are ``hash`` and ``unified``. +``hash`` is the default mode that displays the output that's described above. +``unified`` displays the output similar to ``diff -u``. Default settings are +prefixed with a minus sign, followed by the changed setting prefixed with a +plus sign. + ``dumpdata`` ------------ diff --git a/docs/releases/2.0.txt b/docs/releases/2.0.txt index de5b38a098..ee9ae181b4 100644 --- a/docs/releases/2.0.txt +++ b/docs/releases/2.0.txt @@ -187,6 +187,9 @@ Management Commands * :djadmin:`loaddata` can now :ref:`read from stdin <loading-fixtures-stdin>`. +* The new :option:`diffsettings --output` option allows formatting the output + in a unified diff format. + Migrations ~~~~~~~~~~ |