Merging upstream version 0.3.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
bcca16d621
commit
7777e97ea4
11 changed files with 181 additions and 270 deletions
29
doc/zdiff.1
29
doc/zdiff.1
|
@ -1,7 +1,7 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
|
||||
.TH ZDIFF "1" "August 2009" "Zdiff 0.2" "User Commands"
|
||||
.TH ZDIFF "1" "August 2009" "Zdiff 0.3" "User Commands"
|
||||
.SH NAME
|
||||
Zdiff \- manual page for Zdiff 0.2
|
||||
Zdiff \- manual page for Zdiff 0.3
|
||||
.SH SYNOPSIS
|
||||
.B zdiff
|
||||
[\fIOPTIONS\fR] [\fIDIFF_OPTIONS\fR] \fIFILE1 \fR[\fIFILE2\fR]
|
||||
|
@ -15,9 +15,12 @@ content is used. The supported compressors are gzip, bzip2, lzip and xz.
|
|||
.PP
|
||||
Zcmp is a shortcut for "zdiff \fB\-\-cmp\fR"
|
||||
.PP
|
||||
Compares FILE1 to FILE2. If FILE2 is omitted, compares FILE1 to the
|
||||
uncompressed contents of FILE1.[gz|bz2|lz] (depending on the default
|
||||
compressor selected). DIFF_OPTIONS are passed directly to diff or cmp.
|
||||
Compares FILE1 to FILE2. If FILE2 is omitted and FILE1 is compressed,
|
||||
compares FILE1 to the file with the corresponding decompressed file
|
||||
name (removes the extension from FILE1). If FILE2 is omitted and FILE1
|
||||
is not compressed, compares FILE1 to the uncompressed contents of
|
||||
FILE1.[gz|bz2|lz|xz] (the first one that is found).
|
||||
DIFF_OPTIONS are passed directly to diff or cmp.
|
||||
The exit status from diff or cmp is preserved.
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
|
@ -27,26 +30,14 @@ display this help and exit
|
|||
\fB\-V\fR, \fB\-\-version\fR
|
||||
output version information and exit
|
||||
.TP
|
||||
\fB\-\-gzip\fR
|
||||
use gzip as default decompressor
|
||||
.TP
|
||||
\fB\-\-bzip2\fR
|
||||
use bzip2 as default decompressor
|
||||
.TP
|
||||
\fB\-\-lzip\fR
|
||||
use lzip as default decompressor (default)
|
||||
.TP
|
||||
\fB\-\-xz\fR
|
||||
use xz as default decompressor
|
||||
.TP
|
||||
\fB\-\-diff\fR
|
||||
use diff to compare files (default)
|
||||
.TP
|
||||
\fB\-\-cmp\fR
|
||||
use cmp to compare files
|
||||
.SH "REPORTING BUGS"
|
||||
Report bugs to lzip\-bug@nongnu.org
|
||||
Lzip home page: http://www.nongnu.org/lzip/lzip.html
|
||||
Report bugs to zutils\-bug@nongnu.org
|
||||
Zutils home page: http://www.nongnu.org/zutils/zutils.html
|
||||
.SH COPYRIGHT
|
||||
Copyright \(co 2009 Antonio Diaz Diaz.
|
||||
This script is free software: you have unlimited permission
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue