2
0
Эх сурвалжийг харах

Merge branch 'main' into config-command-line.

Dan Helfman 4 сар өмнө
parent
commit
3e05eeb4de

+ 2 - 0
NEWS

@@ -1,4 +1,6 @@
 2.0.0.dev0
 2.0.0.dev0
+ * #262: Add a "default_actions" option that supports disabling default actions when borgmatic is
+   run without any command-line arguments.
  * #303: Deprecate the "--override" flag in favor of direct command-line flags for every borgmatic
  * #303: Deprecate the "--override" flag in favor of direct command-line flags for every borgmatic
    configuration option. See the documentation for more information:
    configuration option. See the documentation for more information:
    https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#configuration-overrides
    https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#configuration-overrides

+ 2 - 2
borgmatic/config/schema.yaml

@@ -2811,6 +2811,6 @@ properties:
         description: |
         description: |
             Whether to apply default actions (e.g., backup) when no arguments
             Whether to apply default actions (e.g., backup) when no arguments
             are supplied to the borgmatic command. If set to true, borgmatic
             are supplied to the borgmatic command. If set to true, borgmatic
-            will trigger the default actions(create, prune, compact and check).
-            If set to false, borgmatic will display the help message instead.
+            triggers the default actions (create, prune, compact and check). If
+            set to false, borgmatic displays the help message instead.
         example: true
         example: true