- publishing free software manuals
Version Management with CVS - the CVS manual
by Per Cederqvist et al.
Paperback (6"x9"), 216 pages, 8 figures
ISBN 0954161718
RRP £19.95 ($29.95)

Get a printed copy>>>

H Diff format options

The following options specify the format of the output of the ‘cvs diff’ command (see section A.10 diff--Show differences between revisions). They have the same meaning as in GNU diff. Most options have two equivalent names, one of which is a single letter preceded by ‘-’, and the other of which is a long name preceded by ‘--’.

‘-lines
Show lines (an integer) lines of context. This option does not specify an output format by itself; it has no effect unless it is combined with ‘-c’ or ‘-u’. This option is obsolete. For proper operation, patch typically needs at least two lines of context.
‘-a’
Treat all files as text and compare them line-by-line, even if they do not seem to be text.
‘-b’
Ignore trailing white space and consider all other sequences of one or more white space characters to be equivalent.
‘-B’
Ignore changes that just insert or delete blank lines.
‘--binary’
Read and write data in binary mode.
‘--brief’
Report only whether the files differ, not the details of the differences.
‘-c’
Use the context output format.
‘-C lines
‘--context[=lines]’
Use the context output format, showing lines (an integer) lines of context, or three if lines is not given. For proper operation, patch typically needs at least two lines of context.
‘--changed-group-format=format
Use format to output a line group containing differing lines from both files in if-then-else format. See section H.1 Line group formats.
‘-d’
Change the algorithm to perhaps find a smaller set of changes. This makes diff slower (sometimes much slower).
‘-e’
‘--ed’
Make output that is a valid ed script.
‘--expand-tabs’
Expand tabs to spaces in the output, to preserve the alignment of tabs in the input files.
‘-f’
Make output that looks vaguely like an ed script but has changes in the order they appear in the file.
‘-F regexp
In context and unified format, for each hunk of differences, show some of the last preceding line that matches regexp.
‘--forward-ed’
Make output that looks vaguely like an ed script but has changes in the order they appear in the file.
‘-H’
Use heuristics to speed handling of large files that have numerous scattered small changes.
‘--horizon-lines=lines
Do not discard the last lines lines of the common prefix and the first lines lines of the common suffix.
‘-i’
Ignore changes in case; consider upper- and lower-case letters equivalent.
‘-I regexp
Ignore changes that just insert or delete lines that match regexp.
‘--ifdef=name
Make merged if-then-else output using name.
‘--ignore-all-space’
Ignore white space when comparing lines.
‘--ignore-blank-lines’
Ignore changes that just insert or delete blank lines.
‘--ignore-case’
Ignore changes in case; consider upper- and lower-case to be the same.
‘--ignore-matching-lines=regexp
Ignore changes that just insert or delete lines that match regexp.
‘--ignore-space-change’
Ignore trailing white space and consider all other sequences of one or more white space characters to be equivalent.
‘--initial-tab’
Output a tab rather than a space before the text of a line in normal or context format. This causes the alignment of tabs in the line to look normal.
‘-L label
Use label instead of the file name in the context format and unified format headers.
‘--label=label
Use label instead of the file name in the context format and unified format headers.
‘--left-column’
Print only the left column of two common lines in side by side format.
‘--line-format=format
Use format to output all input lines in if-then-else format. See section H.2 Line formats.
‘--minimal’
Change the algorithm to perhaps find a smaller set of changes. This makes diff slower (sometimes much slower).
‘-n’
Output RCS-format diffs; like ‘-f’ except that each command specifies the number of lines affected.
‘-N’
‘--new-file’
In directory comparison, if a file is found in only one directory, treat it as present but empty in the other directory.
‘--new-group-format=format
Use format to output a group of lines taken from just the second file in if-then-else format. See section H.1 Line group formats.
‘--new-line-format=format
Use format to output a line taken from just the second file in if-then-else format. See section H.2 Line formats.
‘--old-group-format=format
Use format to output a group of lines taken from just the first file in if-then-else format. See section H.1 Line group formats.
‘--old-line-format=format
Use format to output a line taken from just the first file in if-then-else format. See section H.2 Line formats.
‘-p’
Show which C function each change is in.
‘--rcs’
Output RCS-format diffs; like ‘-f’ except that each command specifies the number of lines affected.
‘--report-identical-files’
‘-s’
Report when two files are the same.
‘--show-c-function’
Show which C function each change is in.
‘--show-function-line=regexp
In context and unified format, for each hunk of differences, show some of the last preceding line that matches regexp.
‘--side-by-side’
Use the side by side output format.
‘--speed-large-files’
Use heuristics to speed handling of large files that have numerous scattered small changes.
‘--suppress-common-lines’
Do not print common lines in side by side format.
‘-t’
Expand tabs to spaces in the output, to preserve the alignment of tabs in the input files.
‘-T’
Output a tab rather than a space before the text of a line in normal or context format. This causes the alignment of tabs in the line to look normal.
‘--text’
Treat all files as text and compare them line-by-line, even if they do not appear to be text.
‘-u’
Use the unified output format.
‘--unchanged-group-format=format
Use format to output a group of common lines taken from both files in if-then-else format. See section H.1 Line group formats.
‘--unchanged-line-format=format
Use format to output a line common to both files in if-then-else format. See section H.2 Line formats.
‘-U lines
‘--unified[=lines]’
Use the unified output format, showing lines (an integer) lines of context, or three if lines is not given. For proper operation, patch typically needs at least two lines of context.
‘-w’
Ignore white space when comparing lines.
‘-W columns
‘--width=columns
Use an output width of columns in side by side format.
‘-y’
Use the side by side output format.
ISBN 0954161718Version Management with CVS - the CVS manualSee the print edition