summaryrefslogtreecommitdiff
path: root/development/icdiff/icdiff.1
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2021-08-31 10:31:22 -0400
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2021-10-13 00:51:56 +0700
commitd7dff4b2d5d283fce746611d92affee7d3d02860 (patch)
tree1673f55aeda5edad303233c9db757858ab29a590 /development/icdiff/icdiff.1
parent90fb3f22807b16134f5edc8f72eb39a32714882d (diff)
downloadslackbuilds-d7dff4b2d5d283fce746611d92affee7d3d02860.tar.gz
development/icdiff: Updated for version 2.0.4.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development/icdiff/icdiff.1')
-rw-r--r--development/icdiff/icdiff.147
1 files changed, 28 insertions, 19 deletions
diff --git a/development/icdiff/icdiff.1 b/development/icdiff/icdiff.1
index a0d718e92d..d5bb5306e2 100644
--- a/development/icdiff/icdiff.1
+++ b/development/icdiff/icdiff.1
@@ -1,8 +1,5 @@
.\" Man page generated from reStructuredText.
.
-.TH ICDIFF 1 "2020-11-15" "1.9.5" "SlackBuilds.org"
-.SH NAME
-icdiff \- improved color diff
.
.nr rst2man-indent-level 0
.
@@ -30,6 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
+.TH "ICDIFF" 1 "2021-08-31" "2.0.4" "SlackBuilds.org"
+.SH NAME
+icdiff \- improved color diff
.\" RST source for icdiff(1) man page. Convert with:
.
.\" rst2man.py icdiff.rst > icdiff.1
@@ -49,10 +49,10 @@ git\-icdiff [\fIgit diff options\fP]
.SH OPTIONS
.INDENT 0.0
.TP
-.B \-\-version
+.B \-\-version
show program\(aqs version number and exit
.TP
-.B \-h\fP,\fB \-\-help
+.B \-h\fP,\fB \-\-help
show this help message and exit
.TP
.BI \-\-cols\fB= COLS
@@ -61,53 +61,62 @@ specify the width of the screen. Autodetection is Unix only
.BI \-\-encoding\fB= ENCODING
specify the file encoding; defaults to utf8
.TP
-.BI \-E \ MATCHER\fP,\fB \ \-\-exclude\-lines\fB= MATCHER
+.BI \-E \ MATCHER\fR,\fB \ \-\-exclude\-lines\fB= MATCHER
Do not diff lines that match this regex. Not compatible with the \(aqline\-numbers\(aq option
.TP
.BI \-\-head\fB= HEAD
consider only the first N lines of each file
.TP
-.B \-H\fP,\fB \-\-highlight
+.B \-H\fP,\fB \-\-highlight
color by changing the background color instead of the foreground color. Very fast, ugly, displays all changes
.TP
-.BI \-L \ LABELS\fP,\fB \ \-\-label\fB= LABELS
+.BI \-L \ LABELS\fR,\fB \ \-\-label\fB= LABELS
override file labels with arbitrary tags. Use twice, one for each file
.TP
-.B \-N\fP,\fB \-\-line\-numbers
+.B \-N\fP,\fB \-\-line\-numbers
generate output with line numbers. Not compatible with the \(aqexclude\-lines\(aq option.
.TP
-.B \-\-no\-bold
+.B \-\-no\-bold
use non\-bold colors; recommended for solarized
.TP
-.B \-\-no\-headers
+.B \-\-no\-headers
don\(aqt label the left and right sides with their file names
.TP
.BI \-\-output\-encoding\fB= OUTPUT_ENCODING
specify the output encoding; defaults to utf8
.TP
-.B \-r\fP,\fB \-\-recursive
+.B \-r\fP,\fB \-\-recursive
recursively compare subdirectories
.TP
-.B \-\-show\-all\-spaces
+.B \-s\fP,\fB \-\-report\-identical\-files
+report when two files are the same
+.TP
+.B \-\-show\-all\-spaces
color all non\-matching whitespace including that which is not needed for drawing the eye to changes. Slow, ugly, displays all changes
.TP
.BI \-\-tabsize\fB= TABSIZE
tab stop spacing
.TP
-.B \-u\fP,\fB \-\-patch
+.B \-t\fP,\fB \-\-truncate
+truncate long lines instead of wrapping them
+.TP
+.B \-u\fP,\fB \-\-patch
generate patch. This is always true, and only exists for compatibility
.TP
-.BI \-U \ NUM\fP,\fB \ \-\-unified\fB= NUM\fP,\fB \ \-\-numlines\fB= NUM
+.BI \-U \ NUM\fR,\fB \ \-\-unified\fB= NUM\fR,\fB \ \-\-numlines\fB= NUM
how many lines of context to print; can\(aqt be combined with \-\-whole\-file
.TP
-.B \-W\fP,\fB \-\-whole\-file
+.B \-W\fP,\fB \-\-whole\-file
show the whole file instead of just changed lines and context
.TP
-.B \-\-strip\-trailing\-cr
+.B \-\-strip\-trailing\-cr
strip any trailing carriage return at the end of an input line
.TP
.BI \-\-color\-map\fB= COLOR_MAP
choose which colors are used for which items. Default is \-\-color\-map=\(aqadd:green_bold,change:yellow_bold,description:blue,meta:magenta,separator:blue,subtract:red_bold\(aq. You don\(aqt have to override all of them: \(aq\-\-color\-map=separator:white,description:cyan\(aq
+.TP
+.B \-\-is\-git\-diff
+Show the real file name when displaying git\-diff result
.UNINDENT
.SH NOTE
.sp
@@ -115,10 +124,10 @@ It\(aqs highly recommended to use wide terminals with \fBicdiff\fP, for
instance 160 columns or more.
.SH EXAMPLES
.sp
-See the file /usr/doc/icdiff\-1.9.5/README.md for examples.
+See the file /usr/doc/icdiff\-2.0.4/README.md for examples.
.SH COPYRIGHT
.sp
-See the file /usr/doc/icdiff\-1.9.5/LICENSE for license information.
+See the file /usr/doc/icdiff\-2.0.4/LICENSE for license information.
.SH AUTHORS
.sp
icdiff was written by Jeff Kaufman.