DIFF(1) GNU Tools DIFF(1)
[options] from-file to-file
diff
from-file
to-file
.
-
, .
, diff - -
.
from-file
, to-file
diff
to-file
from-file
to-file
.
. , -
.
from-file
to-file
, diff
.
-r
--recursive
( ) . diff
.
, ``
''
.
diff
-
. from-file
to-file
-
. , --
, -
.
GNU
diff
.
. -
, --
.
. -ac
-a -c
.
. ([ and ])
.
-lines lines
. ( lines
.)
.
-c
-u
.
. patch
.
-a ,
.
-b .
-B .
--brief
,
.
-c context .
-C lines
--context[=lines]
context lines
. lines
, . patch
.
--changed-group-format=format
if-then-else
, format
.
-d
.
diff
.
-D name
name
, if-then-else
.
-e
--ed ed
.
--exclude=pattern
, basename pattern
--exclude-from=file
, basename file
.
--expand-tabs
,
(tab) .
-f ed
. ,
.
-F regexp
context unified ,
regexp
.
--forward-ed
ed
. ,
.
-h .
.
-H .
--horizon-lines=lines
(common prefix) lines
(common suffix) lines
.
-i .
.
-I regexp
regexp
.
--ifdef=name
name
, if-then-else .
--ignore-all-space
.
--ignore-blank-lines
.
--ignore-case
.
.
--ignore-matching-lines=regexp
regexp
.
--ignore-space-change
.
--initial-tab
context
.
.
-l pr
.
-L label
--label=label
context unified
.
--left-column
(side by side)
.
--line-format=format
if-then-else
format
.
--minimal
. diff
, .
-n RCS .
-f
.
-N
--new-file
,
.
--new-group-format=format
if-then-else ,
format
.
--new-line-format=format
if-then-else ,
format
.
--old-group-format=format
if-then-else ,
format
.
--old-line-format=format
if-then-else ,
format
.
-p C .
-P , ,
.
--paginate
pr
.
-q ,
.
-r , (recursively) .
--rcs RCS .
-f
.
--recursive
, (recursively) .
--report-identical-files
-s .
-S file
, file
.
,
.
--sdiff-merge-assist
sdiff
. sdiff
diff
.
.
--show-c-function
C .
--show-function-line=regexp
context unified ,
regexp
.
--side-by-side
side-by-side ( ) .
--starting-file=file
, file
.
,
.
--suppress-common-lines
side-by-side
.
-t ,
(space) .
-T context
.
.
--text ,
, .
-u unified .
--unchanged-group-format=format
if-then-else ,
format
.
--unchanged-line-format=format
if-then-else ,
format
.
--unidirectional-new-file
, ,
.
-U lines
--unified[=lines]
unified , lines
. lines
, . patch
.
-v
--version
diff
.
-w , .
-W columns
--width=columns
side-by-side , columns
.
-x pattern
, pattern
basename
.
-X file
, file
basename
.
-y side-by-side .
0 , 1 , 2 .
Manpage (http://man.kldp.org), 2004 3 8
GNU Tools 1993-09-22 DIFF(1)