CVS---Concurrent Versions System. Node: diff options

prev UPdiff NEXTdiff examples

A.9.1: diff options

These standard options are supported by diff (see Common options, for a complete description of them):

-D date

Use the most recent revision no later than date. See `-r' for how this affects the comparison.

-k kflag

Process keywords according to kflag. See Keyword substitution.

-l

Local; run only in current working directory.

-R

Examine directories recursively. This option is on by default.

-r tag

Compare with revision tag. Zero, one or two `-r' options can be present. With no `-r' option, the working file will be compared with the revision it was based on. With one `-r', that revision will be compared to your current working file. With two `-r' options those two revisions will be compared (and your working file will not affect the outcome in any way).

One or both `-r' options can be replaced by a `-D date' option, described above.

The following options specify the format of the output. They have the same meaning as in GNU diff.

-0 -1 -2 -3 -4 -5 -6 -7 -8 -9
--binary
--brief
--changed-group-format=arg
-c
  -C nlines
  --context[=lines]
-e --ed
-t --expand-tabs
-f --forward-ed
--horizon-lines=arg
--ifdef=arg
-w --ignore-all-space
-B --ignore-blank-lines
-i --ignore-case
-I regexp
   --ignore-matching-lines=regexp
-h
-b --ignore-space-change
-T --initial-tab
-L label
  --label=label
--left-column
-d --minimal
-N --new-file
--new-line-format=arg
--old-line-format=arg
--paginate
-n --rcs
-s --report-identical-files
-p
--show-c-function
-y --side-by-side
-F regexp
--show-function-line=regexp
-H --speed-large-files
--suppress-common-lines
-a --text
--unchanged-group-format=arg
-u
  -U nlines
  --unified[=lines]
-V arg
-W columns
  --width=columns
prev UPdiff NEXTdiff examples