summaryrefslogtreecommitdiffstats
path: root/doc/zdiff.1
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-02-03 11:13:22 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-02-03 11:13:22 +0000
commit7ad294387df656cf31b2ad699012fc7c9b71d416 (patch)
tree0c9496286128b91ad40d65570954491777baf3e4 /doc/zdiff.1
parentAdding upstream version 1.10. (diff)
downloadzutils-upstream/1.11.tar.xz
zutils-upstream/1.11.zip
Adding upstream version 1.11.upstream/1.11
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--doc/zdiff.130
1 files changed, 25 insertions, 5 deletions
diff --git a/doc/zdiff.1 b/doc/zdiff.1
index 65a34b7..784ef7b 100644
--- a/doc/zdiff.1
+++ b/doc/zdiff.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16.
-.TH ZDIFF "1" "January 2021" "zutils 1.10" "User Commands"
+.TH ZDIFF "1" "January 2022" "zutils 1.11" "User Commands"
.SH NAME
zdiff \- decompress and compare two files line by line
.SH SYNOPSIS
@@ -12,7 +12,9 @@ input. If any file given is compressed, its decompressed content is used.
zdiff is a front end to the program diff and has the limitation that messages
from diff refer to temporary file names instead of those specified.
.PP
-The formats supported are bzip2, gzip, lzip, and xz.
+\&'zdiff \fB\-v\fR \fB\-V\fR' prints the version of the diff program used.
+.PP
+The formats supported are bzip2, gzip, lzip, xz, and zstd.
.PP
zdiff compares file1 to file2. The standard input is used only if file1 or
file2 refers to standard input. If file2 is omitted zdiff tries the
@@ -23,7 +25,7 @@ the corresponding uncompressed file (the name of file1 with the
extension removed).
.IP
\- If file1 is uncompressed, compares it with the decompressed
-contents of file1.[lz|bz2|gz|xz] (the first one that is found).
+contents of file1.[lz|bz2|gz|zst|xz] (the first one that is found).
.PP
Exit status is 0 if inputs are identical, 1 if different, 2 if trouble.
Some options only work if the diff program used supports them.
@@ -66,7 +68,7 @@ process only the formats in <list>
don't read runtime configuration file
.TP
\fB\-O\fR, \fB\-\-force\-format\fR=\fI\,[\/\fR<f1>][,<f2>]
-force the formats given (bz2, gz, lz, xz)
+force the formats given (bz2,gz,lz,xz,zst)
.TP
\fB\-p\fR, \fB\-\-show\-c\-function\fR
show which C function each change is in
@@ -89,6 +91,9 @@ use the unified output format
\fB\-U\fR, \fB\-\-unified=\fR<n>
same as \fB\-u\fR but use <n> lines of context
.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+verbose mode (for \fB\-\-version\fR)
+.TP
\fB\-w\fR, \fB\-\-ignore\-all\-space\fR
ignore all white space
.TP
@@ -109,13 +114,28 @@ set compressor and options for lzip format
.TP
\fB\-\-xz=\fR<command>
set compressor and options for xz format
+.TP
+\fB\-\-zst=\fR<command>
+set compressor and options for zstd format
.SH "REPORTING BUGS"
Report bugs to zutils\-bug@nongnu.org
.br
Zutils home page: http://www.nongnu.org/zutils/zutils.html
.SH COPYRIGHT
-Copyright \(co 2021 Antonio Diaz Diaz.
+Copyright \(co 2022 Antonio Diaz Diaz.
License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
.br
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
+.SH "SEE ALSO"
+The full documentation for
+.B zdiff
+is maintained as a Texinfo manual. If the
+.B info
+and
+.B zdiff
+programs are properly installed at your site, the command
+.IP
+.B info zutils
+.PP
+should give you access to the complete manual.