diff options
Diffstat (limited to 'doc/zdiff.1')
| -rw-r--r-- | doc/zdiff.1 | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/doc/zdiff.1 b/doc/zdiff.1 index be9d335..260d8dd 100644 --- a/doc/zdiff.1 +++ b/doc/zdiff.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH ZDIFF "1" "May 2013" "Zdiff (zutils) 1.0" "User Commands" +.TH ZDIFF "1" "July 2013" "Zdiff (zutils) 1.1-rc2" "User Commands" .SH NAME Zdiff \- decompress and compare two files line by line .SH SYNOPSIS @@ -8,7 +8,7 @@ Zdiff \- decompress and compare two files line by line .SH DESCRIPTION Zdiff compares two files ("\-" means standard input), and if they differ, shows the differences line by line. If any given file is -compressed, its uncompressed content is used. Zdiff is a front end to +compressed, its decompressed content is used. Zdiff is a front end to the diff program and has the limitation that messages from diff refer to temporary filenames instead of those specified. .PP @@ -16,12 +16,15 @@ The supported formats are bzip2, gzip, lzip and xz. .PP Compares <file1> to <file2>. If <file2> is omitted zdiff tries the following: -If <file1> is compressed, compares <file1> to the file with the -corresponding decompressed file name (removes the extension from -<file1>). -If <file1> is not compressed, compares <file1> to the uncompressed +.IP +1. If <file1> is compressed, compares its decompressed contents with +the corresponding uncompressed file (the name of <file1> with the +extension removed). +.IP +2. If <file1> is uncompressed, compares it with the decompressed contents of <file1>.[lz|bz2|gz|xz] (the first one that is found). -If no suitable file is found, compares <file1> to data read from +.IP +3. If no suitable file is found, compares <file1> with data read from standard input. .PP Exit status is 0 if inputs are identical, 1 if different, 2 if trouble. @@ -60,6 +63,9 @@ force given formats (bz2, gz, lz, xz) \fB\-i\fR, \fB\-\-ignore\-case\fR ignore case differences in file contents .TP +\fB\-N\fR, \fB\-\-no\-rcfile\fR +don't read runtime configuration file +.TP \fB\-p\fR, \fB\-\-show\-c\-function\fR show which C function each change is in .TP @@ -83,6 +89,18 @@ same as \fB\-u\fR but use <n> lines of context .TP \fB\-w\fR, \fB\-\-ignore\-all\-space\fR ignore all white space +.TP +\fB\-\-bz2=\fR<command> +set compressor and options for bzip2 format +.TP +\fB\-\-gz=\fR<command> +set compressor and options for gzip format +.TP +\fB\-\-lz=\fR<command> +set compressor and options for lzip format +.TP +\fB\-\-xz=\fR<command> +set compressor and options for xz format .PP Numbers may be followed by a multiplier: k = kB = 10^3 = 1000, Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc... |