summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLibor Peltan <libor.peltan@nic.cz>2024-09-04 17:07:54 +0200
committerDaniel Salzman <daniel.salzman@nic.cz>2024-09-09 19:45:25 +0200
commita9ab4d938f7190fb396a11e2d2f96a7c0ec7656c (patch)
tree517af29e181bd860dea4e684d49a2634fc730899 /doc
parentRemove unwanted /usr/sbin/knot-exporter dir (diff)
downloadknot-a9ab4d938f7190fb396a11e2d2f96a7c0ec7656c.tar.xz
knot-a9ab4d938f7190fb396a11e2d2f96a7c0ec7656c.zip
kjournalprint: implemented merge option
Diffstat (limited to 'doc')
-rw-r--r--doc/man_kjournalprint.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/man_kjournalprint.rst b/doc/man_kjournalprint.rst
index 3b2d024b7..574fa59f7 100644
--- a/doc/man_kjournalprint.rst
+++ b/doc/man_kjournalprint.rst
@@ -48,6 +48,10 @@ Options
**-s**, **--serial** *soa*
Start at a specific SOA serial.
+**-M**, **--merge**
+ Print the changesets merged into one changeset. If zone-in-journal is present,
+ the stored contents with all the changesets applied will be printed.
+
**-H**, **--check**
Enable additional journal semantic checks during printing.