File: diff.1

package info (click to toggle)
manpages-ja 0.3-6
  • links: PTS
  • area: main
  • in suites: hamm
  • size: 5,500 kB
  • ctags: 19
  • sloc: sh: 582; makefile: 77
file content (348 lines) | stat: -rw-r--r-- 7,822 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
.TH DIFF 1 "22sep1993" "GNU Tools" "GNU Tools"
.SH ̾
diff \- 2 ĤΥƥȥեδ֤κ
.SH 
.B diff
[options] from-file to-file
.SH 
.I diff
κǤñʻˡϡ
.I from-file

.I to-file
 2 ĤΥեꤹ뤳ȤǤ
ξ硢diffϡ 2 ĤΥեƤӤޤե
̾Ȥơ`-' ꤷϡɸϤɤ߹ߤԤޤ
.PP
.I from-file
Ȥƥǥ쥯ȥꤷ
.I to-file
ǥ쥯ȥǤʤä硢
.I diff
ϡ
.I to-file
ǻꤷե̾Ʊ̾Υե
.I from-file
Υǥ쥯ȥ꤫ܤơΥեȤδ֤ӤԤޤ
εդˡ
.I to-file
ǥ쥯ȥ
.I from-file
ǥ쥯ȥǤʤ⡢Ʊͤ˽ޤʤ
ǥ쥯ȥǤʤΥեˡ`-' ꤹ뤳ȤϤǤޤ
.PP
.I from_file

.I to_file
ξǥ쥯ȥä硢
.I diff
ϡξΥǥ쥯ȥǥե٥åȽ˥ե̾ƱեƱΤ
ӤƤ
ޤλ
.B \-r
⤷ϡ
.B \-\-recursive
ץ󤬻ꤵƤС
֥ǥ쥯ȥΥեƵŪӤƤޤ
.SS ץ
GNU diff μʥץϰʲ̤Ǥ¾ˤ¿Υץ󤬤ޤ
.PP
ʤ
.B \-\-
λϥץνλ̣ʹߤ
.I from-file

.I to-file
λˤʤΤȤߤʤޤˡȤС`-' ǻϤ
褦ʥե̾ʤɡ
.I diff
ץλȸäƲᤷƤޤ褦ʾͭǤ
.PP
.TP
.BI - lines
.B \-c

.B \-u
Ȥ߹碌ơեȤɽԿ `'
ǻꤷޤΥץǤϡϥեޥåȤѲޤ
.TP
--text	
.br
.ns
.TP
.B \-a
ƥȥեǤʤ褦ʤΤˤĤƤ⡢ƤΥե
ȤȤߤʤơ1 ԤӤƤޤ
.TP
.B \-b
.br
.ns
.TP
.B \-\-ignore\-space\-change
οΰ㤤̵뤷ޤ
.TP
.B \-B
ԤäƤ⤷­ʤʤɤΰ㤤̵뤷ޤ
.TP
.B \-q
.br
.ns
.TP
.B \-\-brief
եΰ㤤ξܺ٤ɽäƤ뤫ɤ𤷤ޤ
.TP
.B \-c
``context output format'' Ѥޤϡpatch ޥɤ
ŬեޥåȤǡäƤԤǤʤԽ
ϤեޥåȤǤǥեȤǤ 3 ԤɽޤԿ
Ѥˤϡ`-Կ'ץȤΥץ
ޤ
.TP
.BI "\-C " Կ
.br
.ns
.TP
.BI \-\-context[= Կ ]
``context output format'' Ѥޤ԰פιԤˡ`Կ'
ǻꤷԿΰפԤɽޤpatch򤦤ޤƯ뤿
ϡʤȤ⡢2 ԤɬפǤ
.TP
.\" .BI \-\-changed\-group\-format= format
.\" ?
.\" .TP
.B \-d
르ꥺ򡢾ʰ㤤⸫ĤΤѹޤΥץ
ꤹdiff٤ʤޤ
.TP
.BI "\-D " name
if-then-else ǥޡϤץץåޥξ
.I name
ˤޤ
.TP
.B \-e
.br
.ns
.TP
.B \-\-ed
.I ed
ΥץȤηǽϤޤ
.TP
.BI \-\-exclude= pattern
ǥ쥯ȥñ̤Ӥλ
.I pattern
˥ޥå̾Υե䥵֥ǥ쥯ȥ̵뤹褦ˤޤ
.TP
.BI \-\-exclude\-from= file
ǥ쥯ȥñ̤Ӥλ
.I file
ǻꤷե˴ޤޤƤѥ˥ޥå̾Υե
֥ǥ쥯ȥ̵뤹褦ˤޤ
.TP
.B \-\-expand\-tabs
ϻˡ֤򥹥ڡѴޤ
.TP
.B \-f
.br
.ns
.TP
.B \-\-forward\-ed
.B ed
ΥץȤȰ츫Ʊ褦ʽϤ򤷤ޤե
㤤ޤΤǡ
.B ed
ǤϻȤޤ
.TP
.BI "\-F " regexp
ƥȤӥ˥եɷκʬˤơʬΥ֥åˡ
ʬΥ֥åԤregexp˥ޥåԤΤǤäȤ֥
˶ᤤԤϤޤ
.TP
.B \-h
ʤˤⵡǽϤޤ̾ UNIX  diff ȤθߴΤˤޤ
.TP
.B \-\-speed\-large\-files
.br
.ns
.TP
.B \-H
礭ʥեǡʰ㤤ˤ褦ʪ򰷤ˡ
®ˤʤ뤳Ȥ⤢ޤ
.TP
.BI \-\-horizon\-lines= lines
2ĤΥեƬˤ붦ʬΤ
linesԤĤޤޤǺʬ򸡺ޤ(̾Ƭζʬ
Ƥ鸡Ԥޤ)
.TP
.B \-i
ʸȾʸΰ㤤̵뤷ޤ
.TP
.BI "\-I " regexp
ɽ regexp ˥ޥåԤϡоݤ鳰ޤ
.TP
.BI \-\-ifdef= name
2ĤΥեκʬ#ifdef nameǰϤǽϤޤ
.TP
.B \-T
.br
.ns
.TP
.B \-\-initial\-tab
diff ϡɲäʤɤΰ̣εƬդ뤿ᡢ
ΤޤޤȥեΥְ֤Ƹˤʤ뤿ᡢե
ȤϤ˥֤Ĥޤ
.TP
.B \-l
Ϥ
.I pr
̤ƥڡդԤޤ
.TP
.BI "\-L " label
.br
.ns
.TP
.BI \-\-label= label
Ϥղäե̾ˡ
.I label
ǻꤷ٥Ѥޤ
.TP
.B \-n
.br
.ns
.TP
.B \-\-rcs
RCSեޥåȤκʬϤޤ
.B \-f
ȻƤޤƥޥɤȡŬѤԿĤȤʤޤ
.TP
.B \-N
.br
.ns
.TP
.B \-\-new\-file
ǥ쥯ȥñ̤ӤλˡΥǥ쥯ȥˤ¸ߤե
ؤƤϡ¾Υǥ쥯ȥǤ϶Υե뤬ΤȤưޤ
.TP
.B \-\-show\-c\-function
.br
.ns
.TP
.B \-p
C Υץǧơɤδؿѹäɽޤ
.TP
.B \-P
ǥ쥯ȥñ̤Ӥλˡ2 ܤΥǥ쥯ȥˤ¸ߤե
ؤƤϡ¾Υǥ쥯ȥǤ϶Υե뤬ΤȤưޤ
.TP
.B \-\-paginate
Ϥ
.I pr
̤ƥڡդԤޤ
.TP
.B \-r
.br
.ns
.TP
.B \-\-recursive
ǥ쥯ȥñ̤Ӥλˡ֥ǥ쥯ȥ꤬С۲ƵŪ
ӤԤޤ
.TP
.B \-\-report\-identical\-files
.br
.ns
.TP
.B \-s
եƤƱäˡλݤ𤷤ޤ
.TP
.BI "\-S " file
.br
.ns
.TP
.BI \-\-starting\-file= file
ǥ쥯ȥñ̤Ӥλˡfile ǻꤷե̾¹Ԥޤ
ϡϢӺȤǤ椫ƳΤǤ
.TP
.B \-\-sdiff\-merge\-assist
.I sdiff
Ȥμˤʤ­ξɽޤ̡sdiff diff ˡ
ΥץդƼ¹ԤΤǡ桼ľܤΥץ
ȤȤϤޤ
.TP
.BI \-\-show\-function\-line= regexp
ƥȤӥ˥եɷκʬˤơʬΥ֥åˡ
ʬΥ֥åԤregexp˥ޥåԤΤǤäȤ֥
˶ᤤԤϤޤ
.TP
.B \-y
.br
.ns
.TP
.B \-\-side\-by\-side
Ӥ 2 ĤΥեƤ򡢲¤٤ɽޤ
.TP
.B \-\-suppress\-common\-lines
side-by-side ɽǡƱƤιԤɽʤ褦ˤޤ
.TP
.BI "\-W " columns
.br
.ns
.TP
.BI \-\-width= columns
side-by-side ɽǡ1 Ԥ
.I columns
ǻꤷʸˤޤ
.TP
.B \-t
ϥեΥְ֤˹礦褦ˡ֤Ÿޤ
.TP
.B \-u
``unified output format'' ˤޤ
.TP
.BI \-\-unchanged\-group\-format= format
ѹʤäʬνϷꤷޤ
.TP
.BI \-\-unchanged\-line\-format= format
ѹʤäԤνϷꤷޤ
.TP
.B \-\-unidirectional\-new\-file
ǥ쥯ȥӤˤơ2ܤΥǥ쥯ȥˤ¸ߤʤե
뤬СƤʬ˽񤭽Фޤ-N ץȤϰۤʤꡢ1
ܤΥǥ쥯ȥˤ¸ߤʤեƤϽϤޤ
.TP
.BI "\-U " Կ
.br
.ns
.TP
.BI \-\-unified[= Կ ]
``unified output format''ˤޤ԰פιԤˡ`'
ꤷԿΰפԤɽޤpatch򤦤ޤƯ뤿
ϡʤȤ⡢2 ԤɬפǤ
.TP
.B \-v
.br
.ns
.TP
.B \-\-version
ܥץΥСɽޤ
.TP
.B \-w
.br
.ns
.TP
.B \-\-ignore\-all\-space
ӻˡ̵뤹褦ˤޤ
.TP
.BI "\-x " pattern
ǥ쥯ȥñ̤Ӥλեǥ쥯ȥ̾
.I pattern
˥ޥåϡӤʤ褦ˤޤ
.TP
.BI "\-X " file
ǥ쥯ȥñ̤Ӥλեǥ쥯ȥ̾
.I file
˴ޤޤ pattern ˥ޥåϡӤʤ褦ˤޤ
.SH Ϣ
cmp(1), comm(1), diff3(1), ed(1), patch(1), pr(1), sdiff(1)
.SH 
ӷ̤Ȥơ㤤̵ä 0 򡢰㤤ȯ줿 1 
顼 2 ֤ޤ