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.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/usage/diff.rst.inc b/docs/usage/diff.rst.inc
index 9f93e4c7e..ef5b831a6 100644
--- a/docs/usage/diff.rst.inc
+++ b/docs/usage/diff.rst.inc
@@ -6,7 +6,7 @@ borg diff
---------
.. code-block:: none
- borg [common options] diff [options] REPO_ARCHIVE1 ARCHIVE2 PATH
+ borg [common options] diff [options] REPO_ARCHIVE1 ARCHIVE2 [PATH...]
.. only:: html
@@ -39,16 +39,16 @@ borg diff
+-------------------------------------------------------+-----------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+
| | ``--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 |
+ +-------------------------------------------------------+-----------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+
| | ``--exclude-caches`` | exclude directories that contain a CACHEDIR.TAG file (http://www.brynosaurus.com/cachedir/spec.html) |
+-------------------------------------------------------+-----------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+
| | ``--exclude-if-present NAME`` | exclude directories that are tagged by containing a filesystem object with the given NAME |
+-------------------------------------------------------+-----------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+
| | ``--keep-exclude-tags``, ``--keep-tag-files`` | if tag objects are specified with ``--exclude-if-present``, don't omit the tag objects themselves from the backup archive |
+-------------------------------------------------------+-----------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+
- | | ``--pattern PATTERN`` | experimental: include/exclude paths matching PATTERN |
- +-------------------------------------------------------+-----------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+
- | | ``--patterns-from PATTERNFILE`` | experimental: read include/exclude patterns from PATTERNFILE, one per line |
- +-------------------------------------------------------+-----------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+
.. raw:: html
@@ -80,11 +80,11 @@ 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
--exclude-caches exclude directories that contain a CACHEDIR.TAG file (http://www.brynosaurus.com/cachedir/spec.html)
--exclude-if-present NAME exclude directories that are tagged by containing a filesystem object with the given NAME
--keep-exclude-tags, --keep-tag-files if tag objects are specified with ``--exclude-if-present``, don't omit the tag objects themselves from the backup archive
- --pattern PATTERN experimental: include/exclude paths matching PATTERN
- --patterns-from PATTERNFILE experimental: read include/exclude patterns from PATTERNFILE, one per line
Description