icdiff.1 4.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144
  1. .\" Man page generated from reStructuredText.
  2. .
  3. .
  4. .nr rst2man-indent-level 0
  5. .
  6. .de1 rstReportMargin
  7. \\$1 \\n[an-margin]
  8. level \\n[rst2man-indent-level]
  9. level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
  10. -
  11. \\n[rst2man-indent0]
  12. \\n[rst2man-indent1]
  13. \\n[rst2man-indent2]
  14. ..
  15. .de1 INDENT
  16. .\" .rstReportMargin pre:
  17. . RS \\$1
  18. . nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
  19. . nr rst2man-indent-level +1
  20. .\" .rstReportMargin post:
  21. ..
  22. .de UNINDENT
  23. . RE
  24. .\" indent \\n[an-margin]
  25. .\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
  26. .nr rst2man-indent-level -1
  27. .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
  28. .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
  29. ..
  30. .TH "ICDIFF" 1 "2021-08-31" "2.0.4" "SlackBuilds.org"
  31. .SH NAME
  32. icdiff \- improved color diff
  33. .\" RST source for icdiff(1) man page. Convert with:
  34. .
  35. .\" rst2man.py icdiff.rst > icdiff.1
  36. .
  37. .\" rst2man.py comes from the SBo development/docutils package.
  38. .
  39. .SH SYNOPSIS
  40. .sp
  41. icdiff [\fI\-options\fP] left_file right_file
  42. .sp
  43. git\-icdiff [\fIgit diff options\fP]
  44. .SH DESCRIPTION
  45. .sp
  46. \fBicdiff\fP show differences between files in a colorful two column view.
  47. .sp
  48. \fBgit\-icdiff\fP is a wrapper around \fBgit diff\fP that uses \fBicdiff\fP to show diffs.
  49. .SH OPTIONS
  50. .INDENT 0.0
  51. .TP
  52. .B \-\-version
  53. show program\(aqs version number and exit
  54. .TP
  55. .B \-h\fP,\fB \-\-help
  56. show this help message and exit
  57. .TP
  58. .BI \-\-cols\fB= COLS
  59. specify the width of the screen. Autodetection is Unix only
  60. .TP
  61. .BI \-\-encoding\fB= ENCODING
  62. specify the file encoding; defaults to utf8
  63. .TP
  64. .BI \-E \ MATCHER\fR,\fB \ \-\-exclude\-lines\fB= MATCHER
  65. Do not diff lines that match this regex. Not compatible with the \(aqline\-numbers\(aq option
  66. .TP
  67. .BI \-\-head\fB= HEAD
  68. consider only the first N lines of each file
  69. .TP
  70. .B \-H\fP,\fB \-\-highlight
  71. color by changing the background color instead of the foreground color. Very fast, ugly, displays all changes
  72. .TP
  73. .BI \-L \ LABELS\fR,\fB \ \-\-label\fB= LABELS
  74. override file labels with arbitrary tags. Use twice, one for each file
  75. .TP
  76. .B \-N\fP,\fB \-\-line\-numbers
  77. generate output with line numbers. Not compatible with the \(aqexclude\-lines\(aq option.
  78. .TP
  79. .B \-\-no\-bold
  80. use non\-bold colors; recommended for solarized
  81. .TP
  82. .B \-\-no\-headers
  83. don\(aqt label the left and right sides with their file names
  84. .TP
  85. .BI \-\-output\-encoding\fB= OUTPUT_ENCODING
  86. specify the output encoding; defaults to utf8
  87. .TP
  88. .B \-r\fP,\fB \-\-recursive
  89. recursively compare subdirectories
  90. .TP
  91. .B \-s\fP,\fB \-\-report\-identical\-files
  92. report when two files are the same
  93. .TP
  94. .B \-\-show\-all\-spaces
  95. color all non\-matching whitespace including that which is not needed for drawing the eye to changes. Slow, ugly, displays all changes
  96. .TP
  97. .BI \-\-tabsize\fB= TABSIZE
  98. tab stop spacing
  99. .TP
  100. .B \-t\fP,\fB \-\-truncate
  101. truncate long lines instead of wrapping them
  102. .TP
  103. .B \-u\fP,\fB \-\-patch
  104. generate patch. This is always true, and only exists for compatibility
  105. .TP
  106. .BI \-U \ NUM\fR,\fB \ \-\-unified\fB= NUM\fR,\fB \ \-\-numlines\fB= NUM
  107. how many lines of context to print; can\(aqt be combined with \-\-whole\-file
  108. .TP
  109. .B \-W\fP,\fB \-\-whole\-file
  110. show the whole file instead of just changed lines and context
  111. .TP
  112. .B \-\-strip\-trailing\-cr
  113. strip any trailing carriage return at the end of an input line
  114. .TP
  115. .BI \-\-color\-map\fB= COLOR_MAP
  116. 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
  117. .TP
  118. .B \-\-is\-git\-diff
  119. Show the real file name when displaying git\-diff result
  120. .UNINDENT
  121. .SH NOTE
  122. .sp
  123. It\(aqs highly recommended to use wide terminals with \fBicdiff\fP, for
  124. instance 160 columns or more.
  125. .SH EXAMPLES
  126. .sp
  127. See the file /usr/doc/icdiff\-2.0.4/README.md for examples.
  128. .SH COPYRIGHT
  129. .sp
  130. See the file /usr/doc/icdiff\-2.0.4/LICENSE for license information.
  131. .SH AUTHORS
  132. .sp
  133. icdiff was written by Jeff Kaufman.
  134. .sp
  135. This man page written for the SlackBuilds.org project
  136. by B. Watson, and is licensed under the WTFPL.
  137. .SH SEE ALSO
  138. .sp
  139. diff(1), colordiff(1), git\-difftool(1)
  140. .sp
  141. The icdiff homepage: \fI\%https://www.jefftk.com/icdiff\fP
  142. .\" Generated by docutils manpage writer.
  143. .