From 2f09a285582cb475a9d27067808d9beefa7f9fba Mon Sep 17 00:00:00 2001 From: Chris Lamb Date: Wed, 8 Mar 2017 08:54:17 +0000 Subject: Fixed #27881 -- Added diffsettings --output option. Thanks Haris Ibrahim K. V. for writng docs. --- docs/ref/django-admin.txt | 10 ++++++++++ docs/releases/2.0.txt | 3 +++ 2 files changed, 13 insertions(+) (limited to 'docs') 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 `. +* The new :option:`diffsettings --output` option allows formatting the output + in a unified diff format. + Migrations ~~~~~~~~~~ -- cgit v1.3