summaryrefslogtreecommitdiffstats
path: root/docs/usage/diff.rst.inc
diff options
context:
space:
mode:
Diffstat (limited to 'docs/usage/diff.rst.inc')
-rw-r--r--docs/usage/diff.rst.inc74
1 files changed, 37 insertions, 37 deletions
diff --git a/docs/usage/diff.rst.inc b/docs/usage/diff.rst.inc
index 21ae9a936..ec3bffc29 100644
--- a/docs/usage/diff.rst.inc
+++ b/docs/usage/diff.rst.inc
@@ -12,41 +12,41 @@ borg diff
.. class:: borg-options-table
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | **positional arguments** |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | | ``REPO::ARCHIVE1`` | repository location and ARCHIVE1 name |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | | ``ARCHIVE2`` | ARCHIVE2 name (no repository location allowed) |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | | ``PATH`` | paths of items inside the archives to compare; patterns are supported |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | **optional arguments** |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | | ``--numeric-owner`` | deprecated, use ``--numeric-ids`` instead |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | | ``--numeric-ids`` | only consider numeric user and group identifiers |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | | ``--same-chunker-params`` | Override check of chunker parameters. |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | | ``--sort`` | Sort the output lines by file path. |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | | ``--json-lines`` | Format output as JSON Lines. |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | .. class:: borg-common-opt-ref |
- | |
- | :ref:`common_options` |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | **Exclusion options** |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | | ``-e PATTERN``, ``--exclude PATTERN`` | exclude paths matching PATTERN |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | | ``--exclude-from EXCLUDEFILE`` | read exclude patterns from EXCLUDEFILE, one per line |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | | ``--pattern PATTERN`` | experimental: include/exclude paths matching PATTERN |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
- | | ``--patterns-from PATTERNFILE`` | experimental: read include/exclude patterns from PATTERNFILE, one per line |
- +-------------------------------------------------------+---------------------------------------+----------------------------------------------------------------------------+
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | **positional arguments** |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | | ``REPO::ARCHIVE1`` | repository location and ARCHIVE1 name |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | | ``ARCHIVE2`` | ARCHIVE2 name (no repository location allowed) |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | | ``PATH`` | paths of items inside the archives to compare; patterns are supported |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | **optional arguments** |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | | ``--numeric-owner`` | deprecated, use ``--numeric-ids`` instead |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | | ``--numeric-ids`` | only consider numeric user and group identifiers |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | | ``--same-chunker-params`` | Override check of chunker parameters. |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | | ``--sort`` | Sort the output lines by file path. |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | | ``--json-lines`` | Format output as JSON Lines. |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | .. class:: borg-common-opt-ref |
+ | |
+ | :ref:`common_options` |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | **Exclusion options** |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | | ``-e PATTERN``, ``--exclude PATTERN`` | exclude paths matching PATTERN |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | | ``--exclude-from EXCLUDEFILE`` | read exclude patterns from EXCLUDEFILE, one per line |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | | ``--pattern PATTERN`` | include/exclude paths matching PATTERN |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
+ | | ``--patterns-from PATTERNFILE`` | read include/exclude patterns from PATTERNFILE, one per line |
+ +-------------------------------------------------------+---------------------------------------+-----------------------------------------------------------------------+
.. raw:: html
@@ -80,8 +80,8 @@ borg diff
Exclusion options
-e PATTERN, --exclude PATTERN exclude paths matching PATTERN
--exclude-from EXCLUDEFILE read exclude patterns from EXCLUDEFILE, one per line
- --pattern PATTERN experimental: include/exclude paths matching PATTERN
- --patterns-from PATTERNFILE experimental: read include/exclude patterns from PATTERNFILE, one per line
+ --pattern PATTERN include/exclude paths matching PATTERN
+ --patterns-from PATTERNFILE read include/exclude patterns from PATTERNFILE, one per line
Description