diff options
Diffstat (limited to 'development/icdiff/icdiff.1')
| -rw-r--r-- | development/icdiff/icdiff.1 | 134 |
1 files changed, 134 insertions, 0 deletions
diff --git a/development/icdiff/icdiff.1 b/development/icdiff/icdiff.1 new file mode 100644 index 0000000000..a0d718e92d --- /dev/null +++ b/development/icdiff/icdiff.1 @@ -0,0 +1,134 @@ +.\" 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 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.\" RST source for icdiff(1) man page. Convert with: +. +.\" rst2man.py icdiff.rst > icdiff.1 +. +.\" rst2man.py comes from the SBo development/docutils package. +. +.SH SYNOPSIS +.sp +icdiff [\fI\-options\fP] left_file right_file +.sp +git\-icdiff [\fIgit diff options\fP] +.SH DESCRIPTION +.sp +\fBicdiff\fP show differences between files in a colorful two column view. +.sp +\fBgit\-icdiff\fP is a wrapper around \fBgit diff\fP that uses \fBicdiff\fP to show diffs. +.SH OPTIONS +.INDENT 0.0 +.TP +.B \-\-version +show program\(aqs version number and exit +.TP +.B \-h\fP,\fB \-\-help +show this help message and exit +.TP +.BI \-\-cols\fB= COLS +specify the width of the screen. Autodetection is Unix only +.TP +.BI \-\-encoding\fB= ENCODING +specify the file encoding; defaults to utf8 +.TP +.BI \-E \ MATCHER\fP,\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 +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 +override file labels with arbitrary tags. Use twice, one for each file +.TP +.B \-N\fP,\fB \-\-line\-numbers +generate output with line numbers. Not compatible with the \(aqexclude\-lines\(aq option. +.TP +.B \-\-no\-bold +use non\-bold colors; recommended for solarized +.TP +.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 +recursively compare subdirectories +.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 +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 +how many lines of context to print; can\(aqt be combined with \-\-whole\-file +.TP +.B \-W\fP,\fB \-\-whole\-file +show the whole file instead of just changed lines and context +.TP +.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 +.UNINDENT +.SH NOTE +.sp +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. +.SH COPYRIGHT +.sp +See the file /usr/doc/icdiff\-1.9.5/LICENSE for license information. +.SH AUTHORS +.sp +icdiff was written by Jeff Kaufman. +.sp +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. +.SH SEE ALSO +.sp +diff(1), colordiff(1), git\-difftool(1) +.sp +The icdiff homepage: \fI\%https://www.jefftk.com/icdiff\fP +.\" Generated by docutils manpage writer. +. |