Lines Matching +full:no +full:- +full:output

2 .\" SPDX-License-Identifier: BSD-3-Clause
24 .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
46 .Op Fl A Ar algo | Fl -algorithm Ar algo
47 .Op Fl -brief
48 .Op Fl -color Ns = Ns Ar when
49 .Op Fl -changed-group-format Ar GFMT
50 .Op Fl -ed
51 .Op Fl -expand-tabs
52 .Op Fl -forward-ed
53 .Op Fl -ignore-all-space
54 .Op Fl -ignore-case
55 .Op Fl -ignore-space-change
56 .Op Fl -initial-tab
57 .Op Fl -minimal
58 .Op Fl -no-dereference
59 .Op Fl -no-ignore-file-name-case
60 .Op Fl -normal
61 .Op Fl -rcs
62 .Op Fl -show-c-function
63 .Op Fl -starting-file
64 .Op Fl -speed-large-files
65 .Op Fl -strip-trailing-cr
66 .Op Fl -tabsize Ar number
67 .Op Fl -text
68 .Op Fl -unified
69 .Op Fl I Ar pattern | Fl -ignore-matching-lines Ar pattern
70 .Op Fl F Ar pattern | Fl -show-function-line Ar pattern
71 .Op Fl L Ar label | Fl -label Ar label
75 .Op Fl A Ar algo | Fl -algorithm Ar algo
76 .Op Fl I Ar pattern | Fl -ignore-matching-lines Ar pattern
77 .Op Fl F Ar pattern | Fl -show-function-line Ar pattern
78 .Op Fl L Ar label | Fl -label Ar label
79 .Op Fl -brief
80 .Op Fl -color Ns = Ns Ar when
81 .Op Fl -changed-group-format Ar GFMT
82 .Op Fl -ed
83 .Op Fl -expand-tabs
84 .Op Fl -forward-ed
85 .Op Fl -ignore-all-space
86 .Op Fl -ignore-case
87 .Op Fl -ignore-space-change
88 .Op Fl -initial-tab
89 .Op Fl -minimal
90 .Op Fl -no-dereference
91 .Op Fl -no-ignore-file-name-case
92 .Op Fl -normal
93 .Op Fl -paginate
94 .Op Fl -rcs
95 .Op Fl -show-c-function
96 .Op Fl -speed-large-files
97 .Op Fl -starting-file
98 .Op Fl -strip-trailing-cr
99 .Op Fl -tabsize Ar number
100 .Op Fl -text
101 .Fl C Ar number | Fl -context Ar number
105 .Op Fl A Ar algo | Fl -algorithm Ar algo
106 .Op Fl I Ar pattern | Fl -ignore-matching-lines Ar pattern
107 .Op Fl -brief
108 .Op Fl -color Ns = Ns Ar when
109 .Op Fl -changed-group-format Ar GFMT
110 .Op Fl -ed
111 .Op Fl -expand-tabs
112 .Op Fl -forward-ed
113 .Op Fl -ignore-all-space
114 .Op Fl -ignore-case
115 .Op Fl -ignore-space-change
116 .Op Fl -initial-tab
117 .Op Fl -minimal
118 .Op Fl -no-dereference
119 .Op Fl -no-ignore-file-name-case
120 .Op Fl -normal
121 .Op Fl -paginate
122 .Op Fl -rcs
123 .Op Fl -show-c-function
124 .Op Fl -speed-large-files
125 .Op Fl -starting-file
126 .Op Fl -strip-trailing-cr
127 .Op Fl -tabsize Ar number
128 .Op Fl -text
129 .Fl D Ar string | Fl -ifdef Ar string
133 .Op Fl A Ar algo | Fl -algorithm Ar algo
134 .Op Fl I Ar pattern | Fl -ignore-matching-lines Ar pattern
135 .Op Fl F Ar pattern | Fl -show-function-line Ar pattern
136 .Op Fl L Ar label | Fl -label Ar label
137 .Op Fl -brief
138 .Op Fl -color Ns = Ns Ar when
139 .Op Fl -changed-group-format Ar GFMT
140 .Op Fl -ed
141 .Op Fl -expand-tabs
142 .Op Fl -forward-ed
143 .Op Fl -ignore-all-space
144 .Op Fl -ignore-case
145 .Op Fl -ignore-space-change
146 .Op Fl -initial-tab
147 .Op Fl -minimal
148 .Op Fl -no-dereference
149 .Op Fl -no-ignore-file-name-case
150 .Op Fl -normal
151 .Op Fl -paginate
152 .Op Fl -rcs
153 .Op Fl -show-c-function
154 .Op Fl -speed-large-files
155 .Op Fl -starting-file
156 .Op Fl -strip-trailing-cr
157 .Op Fl -tabsize Ar number
158 .Op Fl -text
159 .Fl U Ar number | Fl -unified Ar number
167 .Op Fl A Ar algo | Fl -algorithm Ar algo
168 .Op Fl -brief
169 .Op Fl -color Ns = Ns Ar when
170 .Op Fl -changed-group-format Ar GFMT
171 .Op Fl -context
172 .Op Fl -ed
173 .Op Fl -expand-tabs
174 .Op Fl -forward-ed
175 .Op Fl -ignore-all-space
176 .Op Fl -ignore-case
177 .Op Fl -ignore-space-change
178 .Op Fl -initial-tab
179 .Op Fl -minimal
180 .Op Fl -new-file
181 .Op Fl -no-dereference
182 .Op Fl -no-ignore-file-name-case
183 .Op Fl -normal
184 .Op Fl -paginate
185 .Op Fl -rcs
186 .Op Fl -recursive
187 .Op Fl -report-identical-files
188 .Op Fl -show-c-function
189 .Op Fl -speed-large-files
190 .Op Fl -strip-trailing-cr
191 .Op Fl -tabsize Ar number
192 .Op Fl -text
193 .Op Fl -unidirectional-new-file
194 .Op Fl -unified
195 .Op Fl I Ar pattern | Fl -ignore-matching-lines Ar pattern
196 .Op Fl F Ar pattern | Fl -show-function-line Ar pattern
197 .Bk -words
198 .Op Fl L Ar label | Fl -label Ar label
199 .Op Fl S Ar name | Fl -starting-file Ar name
200 .Op Fl X Ar file | Fl -exclude-from Ar file
201 .Op Fl x Ar pattern | Fl -exclude Ar pattern
206 .Op Fl -color Ns = Ns Ar when
207 .Op Fl -expand-tabs
208 .Op Fl -ignore-all-space
209 .Op Fl -ignore-blank-lines
210 .Op Fl -ignore-case
211 .Op Fl -minimal
212 .Op Fl -no-dereference
213 .Op Fl -no-ignore-file-name-case
214 .Op Fl -strip-trailing-cr
215 .Op Fl -suppress-common-lines
216 .Op Fl -tabsize Ar number
217 .Op Fl -text
218 .Op Fl -width
219 .Fl y | Fl -side-by-side
222 .Op Fl -help
223 .Op Fl -version
231 and writes to the standard output the list of changes necessary to
233 No output is produced if the files are identical.
235 Output options (mutually exclusive):
236 .Bl -tag -width Ds
237 .It Fl C Ar number Fl -context Ar number
247 the output format is modified slightly:
248 the output begins with identification of the files involved and
264 output.
265 .It Fl D Ar string Fl -ifdef Ar string
270 on the standard output, with C preprocessor controls included so that
279 .It Fl e -ed
280 Produces output in a form suitable as input for the editor utility,
284 Extra commands are added to the output when comparing directories with
295 the resulting file may no longer be interpreted as an
298 Output is added to indicate which file each set of
305 .It Fl f -forward-ed
306 Identical output to that of the
311 .It Fl -help
319 .It Fl q -brief
321 Does not output a list of changes.
322 .It Fl U Ar number Fl -unified Ar number
339 .It Fl -version
341 .It Fl y Fl -side-by-side
342 Output in two columns with a marker between them.
346 .Bl -tag -width Ds -offset indent -compact
359 .Bl -tag -width Ds
360 .It Fl A Ar algo , Fl -algorithm Ar algo
365 .Bl -tag -width Ds -compact
372 If it encounters worst-case input, the implementation used by
377 aesthetically pleasing diff output by logically grouping lines.
379 The Stone algorithm (commonly known as Hunt-McIlroy or Hunt-Szymanski)
390 Stone algorithm if the input or output options are not supported by
392 .It Fl a -text
402 .It Fl B Fl -ignore-blank-lines
404 .It Fl b -ignore-space-change
407 .It Fl -color= Ns Oo Ar when Oc
419 will use color if the output is a tty and the
421 environment variable is set to a non-empty string.
422 .It Fl d -minimal
426 .It Fl F Ar pattern , Fl -show-function-line Ar pattern
430 .It Fl I Ar pattern Fl -ignore-matching-lines Ar pattern
442 .It Fl i -ignore-case
448 .It Fl l -paginate
449 Pass the output through
452 .It Fl L Ar label Fl -label Ar label
457 .It Fl p -show-c-function
461 For C and Objective-C source code following standard layout conventions, this
463 .It Fl T -initial-tab
465 normal, context or unified output formats.
467 .It Fl t -expand-tabs
468 Will expand tabs in output lines.
471 output adds character(s) to the front of each line which may screw up
472 the indentation of the original source lines and make the output listing
475 .It Fl w -ignore-all-space
477 .Fl b -ignore-space-change
483 .It Fl W Ar number Fl -width Ar number
484 Output at most
493 .Fl -width
495 .Fl -tabsize
497 .It Fl -changed-group-format Ar GFMT
501 .Bl -tag -width %<
507 .It Fl -ignore-file-name-case
509 .It Fl -no-dereference
511 .It Fl -no-ignore-file-name-case
513 .It Fl -normal
514 default diff output
515 .It Fl -speed-large-files
517 .It Fl -strip-trailing-cr
519 .It Fl -suppress-common-lines
520 Do not output common lines when using the side by side format
521 .It Fl -tabsize Ar number
526 .Bl -tag -width Ds
527 .It Fl N -new-file
530 .It Fl P -unidirectional-new-file
536 .It Fl r -recursive
540 .It Fl S Ar name Fl -starting-file Ar name
541 Re-starts a directory
545 .It Fl s -report-identical-files
549 .It Fl X Ar file Fl -exclude-from Ar file
556 .It Fl x Ar pattern Fl -exclude Ar pattern
559 Patterns are matched using shell-style globbing via
577 If a non-regular file such as a device special file or FIFO is encountered,
586 is applied to the non-directory file and the file contained in
588 last component of the non-directory file.
595 .Sq - ,
598 .Ss Output Style
603 .Fl n -rcs
604 .\" -C
606 output contains lines of these forms, where
610 .Bl -tag -width "XX,YYcZZ,QQ" -compact
698 .Bl -tag -width DIFFCOLORS
712 .Bl -tag -width /tmp/diff.XXXXXXXX -compact
723 .Bl -tag -width Ds -offset indent -compact
733 .Fl -help
735 .Fl -version
744 .Bd -literal -offset indent
745 $ diff -ruN /path/to/old_dir /path/to/new_dir
752 .Bd -literal -offset indent
753 $ diff -ruN -x '*.h' -x '*.c' /path/to/old_dir /path/to/new_dir
757 .Bd -literal -offset indent
758 $ diff -q /boot/loader.conf /boot/defaults/loader.conf
765 .Bd -literal -offset indent
777 .Bd -literal -offset indent
778 $ echo "FreeBSD is an operating system" | diff -q -I 'Linux|Open' example.txt -
800 .St -p1003.1-2008
819 by a BSD-licensed implementation written by