Merging upstream version 1.4.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
0fcc2a9007
commit
799d754a32
18 changed files with 115 additions and 119 deletions
6
zgrep.cc
6
zgrep.cc
|
@ -79,7 +79,7 @@ void show_help()
|
|||
" -l, --files-with-matches only print names of files containing matches\n"
|
||||
" -L, --files-without-match only print names of files containing no matches\n"
|
||||
" -m, --max-count=<n> stop after <n> matches\n"
|
||||
" -M, --format=<list> exclude formats not in <list>\n"
|
||||
" -M, --format=<list> process only the formats in <list>\n"
|
||||
" -n, --line-number print the line number of each line\n"
|
||||
" -N, --no-rcfile don't read runtime configuration file\n"
|
||||
" -o, --only-matching show only the part of a line matching <pattern>\n"
|
||||
|
@ -94,7 +94,9 @@ void show_help()
|
|||
" --bz2=<command> set compressor and options for bzip2 format\n"
|
||||
" --gz=<command> set compressor and options for gzip format\n"
|
||||
" --lz=<command> set compressor and options for lzip format\n"
|
||||
" --xz=<command> set compressor and options for xz format\n" );
|
||||
" --xz=<command> set compressor and options for xz format\n"
|
||||
"Numbers may be followed by a multiplier: k = kB = 10^3 = 1000,\n"
|
||||
"Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc...\n" );
|
||||
show_help_addr();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue